changeset 3995:00820f6d9333

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/scrum/controls/jfx//rt
author Martin Sladecek <martin.sladecek@oracle.com>
date Mon, 17 Jun 2013 14:40:21 +0200
parents 4745de498683 83a9bfb58e38
children 2860bee1e5c2
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/Parent.java	Mon Jun 17 15:03:39 2013 +1200
+++ b/javafx-ui-common/src/javafx/scene/Parent.java	Mon Jun 17 14:40:21 2013 +0200
@@ -849,7 +849,7 @@
             }
         } else {
             final Parent parent = getParent();
-            if (parent != null) {
+            if (parent != null && !parent.performingLayout) {
                 parent.requestLayout();
             }
         }