changeset 5171:b97f4a5bcfb2

RT-33150: NPE in Ensemble 8 app when scrolling main screen with mouse wheel Cell culling was occurring slightly too early, leading to blank spots in the virtualised controls.
author jgiles
date Wed, 25 Sep 2013 15:06:23 +1200
parents d61aca2e2f9b
children 8a99b06d9c22
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Wed Sep 25 12:05:27 2013 +1200
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Wed Sep 25 15:06:23 2013 +1200
@@ -2100,9 +2100,6 @@
             }
             // end of fix for RT-32908
 
-            // Now throw away any cells that don't fit
-            cull();
-
             // Add any necessary leading cells
             if (firstCell != null) {
                 int firstIndex = getCellIndex(firstCell);
@@ -2147,6 +2144,9 @@
             }
         }
 
+        // Now throw away any cells that don't fit
+        cull();
+
         // Finally, update the scroll bars
         updateScrollBarsAndCells();
         lastPosition = getPosition();