changeset 2337:64e0643de066

RT-27822: [TreeVew, TreeTableView] setShowRoot() doesn't work.
author jgiles
date Tue, 22 Jan 2013 11:19:05 +1300
parents 83a8d540e79d
children 490b6aa0ba8e
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeViewSkin.java
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java	Sat Jan 19 10:08:14 2013 +1300
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java	Tue Jan 22 11:19:05 2013 +1300
@@ -150,12 +150,11 @@
             // the tree.
             if (! getSkinnable().isShowRoot() && getRoot() != null) {
                  getRoot().setExpanded(true);
-
-                 // update the item count in the flow and behavior instances
-                updateItemCount();
             }
+            // update the item count in the flow and behavior instances
+            updateItemCount();
         } else if ("ROW_FACTORY".equals(p)) {
-            // FIXME can't set treeview cell factory in to a table!
+            flow.recreateCells();
         } else if ("TREE_ITEM_COUNT".equals(p)) {
             updateItemCount();
         }
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeViewSkin.java	Sat Jan 19 10:08:14 2013 +1300
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeViewSkin.java	Tue Jan 22 11:19:05 2013 +1300
@@ -133,10 +133,9 @@
             // the tree.
             if (! getSkinnable().isShowRoot() && getRoot() != null) {
                  getRoot().setExpanded(true);
-
-                 // update the item count in the flow and behavior instances
-                updateItemCount();
             }
+            // update the item count in the flow and behavior instances
+            updateItemCount();
         } else if ("CELL_FACTORY".equals(p)) {
             flow.recreateCells();
         } else if ("FOCUS_TRAVERSABLE".equals(p)) {