changeset 8441:051a0211defc 8u40-b14

RT-39341: TreeTableView doesn't maintain position properly when cells count changes [revert fix for RT-39104] Backed out changeset 9543220a5ff3
author kcr
date Mon, 10 Nov 2014 11:08:34 -0800
parents 63d4e9c8eae4
children f7cf8271d635 a0a093c19cef 0ed48b4e406f
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java modules/controls/src/test/java/javafx/scene/control/ListViewTest.java modules/controls/src/test/java/javafx/scene/control/TreeTableViewTest.java
diffstat 3 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Mon Nov 10 11:41:28 2014 +0300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Mon Nov 10 11:08:34 2014 -0800
@@ -1151,9 +1151,6 @@
 
         initViewport();
 
-        // added in to prevent RT-39104
-        updateScrollBarsAndCells(recreatedOrRebuilt);
-
         // Get the index of the "current" cell
         int currentIndex = computeCurrentIndex();
         if (lastCellCount != cellCount) {
--- a/modules/controls/src/test/java/javafx/scene/control/ListViewTest.java	Mon Nov 10 11:41:28 2014 +0300
+++ b/modules/controls/src/test/java/javafx/scene/control/ListViewTest.java	Mon Nov 10 11:08:34 2014 -0800
@@ -1026,7 +1026,7 @@
                                 listView.scrollTo(55);
                                 Platform.runLater(() -> {
                                     Toolkit.getToolkit().firePulse();
-                                    assertEquals(useFixedCellSize ? 17 : 55, rt_35395_counter);
+                                    assertEquals(useFixedCellSize ? 17 : 53, rt_35395_counter);
                                     sl.dispose();
                                 });
                             });
--- a/modules/controls/src/test/java/javafx/scene/control/TreeTableViewTest.java	Mon Nov 10 11:41:28 2014 +0300
+++ b/modules/controls/src/test/java/javafx/scene/control/TreeTableViewTest.java	Mon Nov 10 11:08:34 2014 -0800
@@ -3888,7 +3888,7 @@
                         Platform.runLater(() -> {
                             Toolkit.getToolkit().firePulse();
 
-                            int expected = useFixedCellSize ? 17 : 62;
+                            int expected = useFixedCellSize ? 17 : 59;
                             assertEquals(expected, rt_35395_counter);
                             sl.dispose();
                         });