changeset 5183:2c2b8f13d1cb

RT-26861: RTL orientation, ColorPicker palette position issue. Reviewed-by: jgiles
author leifs
date Mon, 30 Sep 2013 13:56:25 -0700
parents e0f5c9318547
children 5475dfc3d98a
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxPopupControl.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxPopupControl.java	Mon Sep 30 14:54:04 2013 +1300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxPopupControl.java	Mon Sep 30 13:56:25 2013 -0700
@@ -84,7 +84,7 @@
     
     private Point2D getPrefPopupPosition() {
         double dx = 0;
-        dx += (getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) ? -1 : 1;
+        dx += (getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) ? -3 : 0;
         return com.sun.javafx.Utils.pointRelativeTo(getSkinnable(), getPopupContent(), HPos.CENTER, VPos.BOTTOM, dx, 0, false);
     }
     
@@ -95,6 +95,7 @@
             comboBoxBase.getScene().getRoot().impl_processCSS(true);
         }
         
+        getPopupContent().autosize();
         Point2D p = getPrefPopupPosition();
         _popup.getScene().setNodeOrientation(getSkinnable().getEffectiveNodeOrientation());
         reconfigurePopup();