changeset 5889:7dfe3ed4a7cb

Backout the fix for RT-34575. Unfortunately this fix causes a regression in ScrollableListView - the scroll bars disappear after the first use and don't ever reappear. hg backout -r c3867686aaa4 Reviewed by kcr
author Lisa.Selle@oracle.com
date Tue, 03 Dec 2013 16:18:15 -0500
parents 5f608d7df7a5
children fde6a94b9415
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Tue Dec 03 12:22:53 2013 -0800
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	Tue Dec 03 16:18:15 2013 -0500
@@ -930,7 +930,7 @@
         boolean cellNeedsLayout = false;
 
         if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-            if ((tempVisibility == true && (needBreadthBar && hbar.isVisible() == false || needLengthBar && vbar.isVisible() == false)) ||
+            if ((tempVisibility == true && (hbar.isVisible() == false || vbar.isVisible() == false)) ||
                 (tempVisibility == false && (hbar.isVisible() == true || vbar.isVisible() == true))) {
                 cellNeedsLayout = true;
             }
@@ -1321,8 +1321,8 @@
         // we need the breadth bar and the length bar.
         // The last condition here (viewportLength >= getHeight()) was added to
         // resolve the edge-case identified in RT-14350.
-        needLengthBar = getPosition() > 0 && (cellCount >= cells.size() || viewportLength >= height);
-        needBreadthBar = maxPrefBreadth > viewportBreadth || (needLengthBar && maxPrefBreadth > (viewportBreadth - lengthBarBreadth));
+        boolean needLengthBar = getPosition() > 0 && (cellCount >= cells.size() || viewportLength >= height);
+        boolean needBreadthBar = maxPrefBreadth > viewportBreadth || (needLengthBar && maxPrefBreadth > (viewportBreadth - lengthBarBreadth));
 
         // Start by optimistically deciding whether the length bar and
         // breadth bar are needed and adjust the viewport dimensions
@@ -2108,7 +2108,7 @@
         if (delta == 0) return 0;
 
         final boolean isVertical = isVertical();
-        if (!tempVisibility && ((isVertical && ! vbar.isVisible()) || (! isVertical && ! hbar.isVisible()))) return 0;
+        if ((isVertical && ! vbar.isVisible()) || (! isVertical && ! hbar.isVisible())) return 0;
         
         double pos = getPosition();
         if (pos == 0.0f && delta < 0) return 0;
@@ -2634,8 +2634,6 @@
     KeyFrame sbTouchKF1;
     KeyFrame sbTouchKF2;
 
-    private boolean needBreadthBar;
-    private boolean needLengthBar;
     private boolean tempVisibility = false;
 
     protected void startSBReleasedAnimation() {