changeset 3994:83a9bfb58e38

Forgot to revert hotfix for RT-30363 together with fix for RT-31016. Verified that issues in RT-31016 are not broken again by this changeset.
author Martin Sladecek <martin.sladecek@oracle.com>
date Mon, 17 Jun 2013 14:40:04 +0200
parents 76a7ba878acd
children 00820f6d9333
files javafx-ui-common/src/javafx/scene/Parent.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/Parent.java	Thu Jun 13 10:13:22 2013 +0200
+++ b/javafx-ui-common/src/javafx/scene/Parent.java	Mon Jun 17 14:40:04 2013 +0200
@@ -849,7 +849,7 @@
             }
         } else {
             final Parent parent = getParent();
-            if (parent != null) {
+            if (parent != null && !parent.performingLayout) {
                 parent.requestLayout();
             }
         }