diff -r b9cf71933715 javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ToolBarSkin.fx --- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ToolBarSkin.fx Fri Apr 16 10:56:28 2010 +1200 +++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ToolBarSkin.fx Sun May 23 22:15:44 2010 -0700 @@ -65,7 +65,7 @@ // Toggle the visibility of items based on whether they fit into // the tool bar vertically. - if (node.layoutY + prefHeight > h) { + if (node.layoutBounds.minY + node.layoutY + prefHeight > h) { delete node from content; } else if (node.parent == null) { insert node into content; @@ -81,7 +81,7 @@ // Toggle the visibility of items based on whether they fit into // the tool bar horizontally. - if (node.layoutX + prefWidth > w) { + if (node.layoutBounds.minX + node.layoutX + prefWidth > w) { delete node from content; } else if (node.parent == null) { insert node into content;