changeset 271:79e10e4a0b52

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.1/MASTER/jfx/rt
author kcr
date Thu, 12 Jan 2012 08:23:50 -0800
parents ce1592dd4a9b bb24d4a4d866
children 8e49fb3d64ea
files
diffstat 3 files changed, 120 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/GlobalMenuAdapter.java	Wed Jan 11 11:00:45 2012 -0800
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/GlobalMenuAdapter.java	Thu Jan 12 08:23:50 2012 -0800
@@ -188,7 +188,6 @@
             bindMenuItemProperties(this, menuItem);
 
             selectedProperty().bindBidirectional(menuItem.selectedProperty());
-            toggleGroupProperty().bind(menuItem.toggleGroupProperty());
         }
 
     }
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/caspian.css	Wed Jan 11 11:00:45 2012 -0800
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/caspian/caspian.css	Thu Jan 12 08:23:50 2012 -0800
@@ -465,6 +465,10 @@
     -fx-skin: "com.sun.javafx.scene.control.skin.LabelSkin";
 }
 
+.label Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .label:disabled {
     -fx-opacity: -fx-disabled-opacity;
 }
@@ -497,6 +501,10 @@
     -fx-graphic-vpos: CENTER;
 }
 
+.button Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .button:focused {
     -fx-color: -fx-focused-base;
     -fx-background-color: -fx-focus-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
@@ -543,6 +551,10 @@
     -fx-graphic-vpos: CENTER;
 }
 
+.toggle-button Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .toggle-button:focused {
     -fx-color: -fx-focused-base;
     -fx-background-color: -fx-focus-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
@@ -598,6 +610,10 @@
     -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
 }
 
+.radio-button Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .radio-button:focused {
     -fx-color: -fx-focused-base;
 }
@@ -657,6 +673,10 @@
     -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
 }
 
+.check-box Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .check-box:focused {
     -fx-color: -fx-focused-base;
 }
@@ -727,6 +747,10 @@
     -fx-graphic-vpos: CENTER;    
 }
 
+.hyperlink Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .hyperlink:visited {
     -fx-text-fill: -fx-accent;
 }
@@ -776,6 +800,10 @@
     -fx-padding: 0.333333em 0.083333em 0.666667em 0.083333em; /* 4 1 8 1 */
 }
 
+.context-menu Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .context-menu .separator {
     -fx-padding: 0.0em 0.333333em 0.0em 0.333333em; /* 0 4 0 4 */
 }
@@ -807,6 +835,10 @@
     -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
 }
 
+.menu Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .menu:disabled {
     -fx-opacity: -fx-disabled-opacity;
 }
@@ -876,6 +908,10 @@
     -fx-background-radius: 0, 0 ;
 }
 
+.menu-bar Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .menu-bar .menu .label {
     -fx-padding: 0.333em 0.5em 0.333em 0.5em; /* 4 6 4 6*/
 /*    -fx-effect: dropshadow(two-pass-box , rgba(0, 0, 0, 0.6), 1, 0.0 , 0, 1);*/
@@ -1028,6 +1064,10 @@
     -fx-background-color: transparent;
 }
 
+.radio-menu-item Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .radio-menu-item:focused {
     -fx-background: -fx-accent;
     -fx-background-color: -fx-selection-bar;
@@ -1112,6 +1152,10 @@
     -fx-graphic-vpos: CENTER;
 }
 
+.choice-box Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .choice-box:focused {
     -fx-color: -fx-focused-base;
     -fx-background-color: -fx-focus-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
@@ -1183,6 +1227,10 @@
     -fx-skin: "com.sun.javafx.scene.control.skin.SliderSkin";
 }
 
+.slider Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .slider .thumb {
     -fx-background-color:
         derive(-fx-color,-36%),
@@ -1469,6 +1517,10 @@
     -fx-highlight-text-fill: white;
 }
 
+.text-box Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .text-box:focused {
     -fx-background-color: -fx-focus-color, -fx-text-box-border, -fx-control-inner-background;
     -fx-background-insets: -0.4, 1, 2;
@@ -1523,6 +1575,10 @@
     -fx-echo-char: "\u25cf";
 }
 
+.password-box Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .password-box .viewport {
     -fx-padding: 0.25em 0.416667em 0.25em 0.416667em; /* 3 5 3 5 */
 }
@@ -1565,6 +1621,10 @@
     -fx-cursor: text;
 }
 
+.text-field Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .text-field:focused {
     -fx-background-color: -fx-focus-color, -fx-text-box-border, -fx-control-inner-background;
     -fx-background-insets: -0.4, 1, 2;
@@ -1600,6 +1660,10 @@
     -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
 }
 
+.text-area Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .text-area .scroll-pane {
     -fx-background-color: transparent;
 }
@@ -1662,6 +1726,10 @@
     -fx-padding: 1; /* 0.083333em; */
 }
 
+.list-view Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .list-view:focused {
     -fx-background-color: -fx-focus-color,-fx-box-border,-fx-control-inner-background;
     -fx-background-insets: -1.4, 0, 1;
@@ -1741,6 +1809,10 @@
     -fx-text-fill: -fx-selection-bar-text;
 }
 
+.list-cell Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .list-cell:filled:selected:focused:disabled, .list-cell:filled:selected:disabled {
     -fx-opacity: -fx-disabled-opacity;
 }
@@ -1776,6 +1848,10 @@
     -fx-padding: 1; /* 0.083333em; */
 }
 
+.tree-view Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .tree-view:focused {
     -fx-background-color: -fx-focus-color,-fx-box-border,-fx-control-inner-background;
     -fx-background-insets: -1.4, 0, 1;
@@ -1851,6 +1927,10 @@
     -fx-text-fill: -fx-selection-bar-text;
 }
 
+.tree-cell Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .tree-cell:filled:selected:focused:disabled, .tree-cell:filled:selected:disabled {
     -fx-opacity: -fx-disabled-opacity;
 }
@@ -1912,6 +1992,10 @@
     -fx-padding: 0.0em; /* 0 */
 }
 
+.menu-button Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .menu-button:focused {
     -fx-color: -fx-focused-base;
     -fx-background-color: -fx-focus-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
@@ -1974,6 +2058,10 @@
     -fx-padding: 0.0em; /* 0 */
 }
 
+.split-menu-button Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .split-menu-button:focused {
     -fx-color: -fx-focused-base;
     -fx-background-color: -fx-focus-color;
@@ -2052,6 +2140,10 @@
     -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 );
 }
 
+.tooltip Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .page-corner {
     -fx-padding: 4.5 4.5 4.5 4.5;
     -fx-background-color: linear-gradient( from 0% 0% to 50% 50%, #fcf7b6, #a59c31);
@@ -2198,6 +2290,10 @@
     -fx-progress-color: dodgerblue;
 }
 
+.progress-indicator Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .progress-indicator .indicator {
     -fx-background-color:
         -fx-box-border,
@@ -2260,6 +2356,10 @@
     -fx-table-cell-border-color: #bbbbbb;
 }
 
+.table-view Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 /** Draws focus border around tableview */
 .table-view:focused {
     -fx-background-color: -fx-focus-color,-fx-box-border,-fx-control-inner-background;
@@ -2369,6 +2469,10 @@
     -fx-cell-size: 2.0em; /* 24 */
 }
 
+.table-cell Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 /* When in constrained resize mode, the right-most visible cell should not have
    a right-border, as it is not possible to get this cleanly out of view without
    introducing horizontal scrollbars (see RT-14886). */
@@ -2551,6 +2655,10 @@
     -fx-skin: "com.sun.javafx.scene.control.skin.TitledPaneSkin";
 }
 
+.titled-pane Text {
+    -fx-font-smoothing-type: lcd;
+}
+
 .titled-pane > .title {
     -fx-background-color: -fx-box-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
@@ -2723,6 +2831,7 @@
 
 .tab *.tab-label Text {
     -fx-effect: dropshadow(two-pass-box , rgba(255, 255, 255, 0.4), 1, 0.0 , 0, 1);
+    -fx-font-smoothing-type: lcd;
 }
 
 .tab-content-area {
@@ -2918,6 +3027,11 @@
     -fx-fill: null;
     -fx-stroke: #AAAAAA;
 }
+
+.tick-mark {
+  -fx-font-smoothing-type: lcd;
+}
+
 /* ====== CHART PLOT BACKGROUND =========================================================== */
 .chart-plot-background {
     -fx-background-color: #f5f5f5;
--- a/test-stub-toolkit/src/com/sun/javafx/pgstub/StubText.java	Wed Jan 11 11:00:45 2012 -0800
+++ b/test-stub-toolkit/src/com/sun/javafx/pgstub/StubText.java	Thu Jan 12 08:23:50 2012 -0800
@@ -42,6 +42,7 @@
     private int textBoundsType;
     private int textOrigin;
     private int textAlignment;
+    private int fontSmoothingType;
 
     public RectBounds computeLayoutBounds(RectBounds bounds) {
         // We assume that the font point size == pixel height,
@@ -89,6 +90,11 @@
     public void setTextAlignment(int alignment) { textAlignment = alignment; }
     public int getTextAlignment() { return textAlignment; }
     
+    public int getFontSmoothingType() { return fontSmoothingType; }
+    public void setFontSmoothingType(int fontSmoothing) { 
+        fontSmoothingType = fontSmoothing;
+    }
+
     public void setInputMethodText(int start, Object text) { }
 
     // somewhat questionable -- do these remain in PGText??