changeset 1658:279df74040c4

FXVK: Restored call to super.layoutChildren() which was lost by fix for RT-23459.
author leifs
date Tue, 07 Aug 2012 11:28:08 -0700
parents 478e4475cacd
children 73aed3d884dd
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVKSkin.java
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVKSkin.java	Thu Aug 09 10:39:55 2012 +0200
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVKSkin.java	Tue Aug 07 11:28:08 2012 -0700
@@ -67,6 +67,7 @@
 import javafx.animation.Animation.Status;
 import static javafx.scene.input.KeyCode.*;
 import static javafx.scene.input.MouseEvent.*;
+import static javafx.scene.layout.Region.*;
 
 import static com.sun.javafx.scene.control.skin.resources.EmbeddedResources.*;
 
@@ -206,7 +207,7 @@
 
                         if (oldNode == null || oldNode.getScene() != attachedNode.getScene()) {
                             fxvk.setPrefWidth(scene.getWidth());
-                            fxvk.setMaxWidth(Region.USE_PREF_SIZE);
+                            fxvk.setMaxWidth(USE_PREF_SIZE);
                             fxvk.setPrefHeight(200);
                         }
 
@@ -221,10 +222,10 @@
 
                         if (oldNode == null || oldNode.getScene() != attachedNode.getScene()) {
                             fxvk.setPrefWidth(VK_WIDTH);
-                            fxvk.setMinWidth(Region.USE_PREF_SIZE);
-                            fxvk.setMaxWidth(Region.USE_PREF_SIZE);
+                            fxvk.setMinWidth(USE_PREF_SIZE);
+                            fxvk.setMaxWidth(USE_PREF_SIZE);
                             fxvk.setPrefHeight(VK_HEIGHT);
-                            fxvk.setMinHeight(Region.USE_PREF_SIZE);
+                            fxvk.setMinHeight(USE_PREF_SIZE);
                         }
                     }
                 } else {
@@ -689,7 +690,7 @@
             createKeys();
         }
 
-//        super.layoutChildren();
+        super.layoutChildren(x, y, w, h);
 
         for (Node vnode : vbox.getChildren()) {
             hbox = (HBox)vnode;
@@ -782,9 +783,9 @@
                 final double h = insets.getTop() + insets.getBottom() +
                                  nRows * primarySkin.keyHeight + (nRows-1) * vbox.getSpacing();
                 secondaryVK.setPrefWidth(w);
-                secondaryVK.setMinWidth(Region.USE_PREF_SIZE);
+                secondaryVK.setMinWidth(USE_PREF_SIZE);
                 secondaryVK.setPrefHeight(h);
-                secondaryVK.setMinHeight(Region.USE_PREF_SIZE);
+                secondaryVK.setMinHeight(USE_PREF_SIZE);
                 Platform.runLater(new Runnable() {
                     public void run() {
                         // Position popup on screen