changeset 2874:36fcf9f812ed

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/scrum/controls/rt
author David Grieve<david.grieve@oracle.com>
date Mon, 11 Mar 2013 15:38:40 -0400
parents fd29ff6315e7 a7abdf74e155
children 636b8f96d38a
files
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/stage/PopupWindow.java	Mon Mar 11 15:01:11 2013 +0000
+++ b/javafx-ui-common/src/javafx/stage/PopupWindow.java	Mon Mar 11 15:38:40 2013 -0400
@@ -386,13 +386,9 @@
 
         final Scene sceneValue = getScene();
         if (sceneValue != null) {
-            SceneHelper.parentEffectiveOrientationInvalidated(sceneValue);            
+            SceneHelper.parentEffectiveOrientationInvalidated(sceneValue);
         }
         
-        // RT-28447
-        final Scene ownerScene = getRootWindow(owner).getScene();
-        sceneValue.getStylesheets().setAll(ownerScene.getStylesheets());
-        
         // It is required that the root window exist and be visible to show the popup.
         if (getRootWindow(owner).isShowing()) {
             // We do show() first so that the width and height of the
--- a/javafx-ui-common/test/unit/javafx/scene/Node_effectiveOrientation_Css_Test.java	Mon Mar 11 15:01:11 2013 +0000
+++ b/javafx-ui-common/test/unit/javafx/scene/Node_effectiveOrientation_Css_Test.java	Mon Mar 11 15:38:40 2013 -0400
@@ -41,7 +41,6 @@
 /**
  * Test :dir functional pseudo-class 
  */
-@org.junit.Ignore
 public class Node_effectiveOrientation_Css_Test {
     
     private Group root;
@@ -79,7 +78,7 @@
         root.getChildren().add(rect);
 
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
         assertEquals(Color.web("#00ff00"), rect.getFill());
@@ -100,7 +99,7 @@
 
         scene.setNodeOrientation(RIGHT_TO_LEFT);
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
         assertEquals(Color.web("#ff0000"), rect.getFill());
@@ -120,7 +119,7 @@
         root.getChildren().add(rect);
 
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
         assertEquals(Color.web("#00ff00"), rect.getFill());
@@ -141,7 +140,7 @@
 
         scene.setNodeOrientation(RIGHT_TO_LEFT);
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
         assertEquals(Color.web("#ff0000"), rect.getFill());
@@ -161,7 +160,7 @@
         root.getChildren().add(rect);
 
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
         assertEquals(Color.web("#00ff00"), rect.getFill());
@@ -182,7 +181,7 @@
 
         scene.setNodeOrientation(RIGHT_TO_LEFT);
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
         assertEquals(Color.web("#ff0000"), rect.getFill());
@@ -204,7 +203,7 @@
         rect.setNodeOrientation(RIGHT_TO_LEFT);
 
         // CSS is applied on next pulse after child is added
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
         assertEquals(rect.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
@@ -214,7 +213,7 @@
         scene.setNodeOrientation(RIGHT_TO_LEFT);
         rect.setNodeOrientation(LEFT_TO_RIGHT);
         
-        Toolkit.getToolkit().firePulse();
+        root.impl_processCSS(true);
         
         assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
         assertEquals(rect.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);