Changeset 12079 in josm

Timestamp:

2017-05-07T00:16:14+02:00 (8 years ago)

Author:

michael2402

Message:

ScrollViewport: Fix layout computation, natively support mouse wheel

The layout size width/height is set to the one of the inner component if scrolling in that direction is not enabled.
The ScrollViewport now supports the mouse wheel in both horizontal and vertical versions.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (1 diff)
• ScrollViewport.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -496 +496 @@
         if (Main.pref.getBoolean("sidetoolbar.scrollable", true)) {
             final ScrollViewport svp = new ScrollViewport(sideToolBar, ScrollViewport.VERTICAL_DIRECTION);
-            svp.addMouseWheelListener(e -> svp.scroll(0, e.getUnitsToScroll() * 5));
             sideToolBar = svp;
         }

trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

@@ -141 +141 @@
         showOrHideButtons();
 
+        if ((direction & VERTICAL_DIRECTION) != 0) {
+            addMouseWheelListener(e -> scroll(0, e.getUnitsToScroll() * 5));
+        } else if ((direction & HORIZONTAL_DIRECTION) != 0) {
+            addMouseWheelListener(e -> scroll(e.getUnitsToScroll() * 5, 0));
+        }
+
         timer.setRepeats(true);
         timer.setInitialDelay(400);
@@ -248 +254 @@
     @Override
     public Dimension getPreferredSize() {
-        return vp.getPreferredSize();
+        if (component == null) {
+            return vp.getPreferredSize();
+        } else {
+            return component.getPreferredSize();
+        }
     }
 
     @Override
     public Dimension getMinimumSize() {
-        return vp.getMinimumSize();
+        if (component == null) {
+            return vp.getMinimumSize();
+        } else {
+            Dimension minSize = component.getMinimumSize();
+            if ((allowedScrollDirections & HORIZONTAL_DIRECTION) != 0) {
+                minSize = new Dimension(20, minSize.height);
+            }
+            if ((allowedScrollDirections & VERTICAL_DIRECTION) != 0) {
+                minSize = new Dimension(minSize.width, 20);
+            }
+            return minSize;
+        }
     }