Changeset 11055 in josm

Timestamp:

2016-09-27T00:28:57+02:00 (8 years ago)

Author:

michael2402

Message:

Fix #13703: Allow mouse wheel to change visibility slider value.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/layer/LayerVisibilityAction.java (modified) (5 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -40 +41 @@
 public final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
     private static final int SLIDER_STEPS = 100;
+    /**
+     * Steps the value is changed by a mouse wheel change (one full click)
+     */
+    private static final int SLIDER_WHEEL_INCREMENT = 5;
     private static final double MAX_SHARPNESS_FACTOR = 2;
     private static final double MAX_COLORFUL_FACTOR = 2;
@@ -172 +177 @@
 
             addChangeListener(e -> onStateChanged());
+            addMouseWheelListener(this::mouseWheelMoved);
         }
 
@@ -186 +192 @@
         }
 
+        protected void mouseWheelMoved(MouseWheelEvent e) {
+            double rotation = e.getPreciseWheelRotation();
+            double destinationValue = getValue() + rotation * SLIDER_WHEEL_INCREMENT;
+            if (rotation < 0) {
+                destinationValue = Math.floor(destinationValue);
+            } else {
+                destinationValue = Math.ceil(destinationValue);
+            }
+            setValue(Utils.clamp((int) destinationValue, getMinimum(), getMaximum()));
+            e.consume();
+        }
+
         protected void applyValueToLayer(T layer) {
         }
@@ -204 +222 @@
         protected int convertFromRealValue(double value) {
             int i = (int) ((value - minValue) / (maxValue - minValue) * SLIDER_STEPS + .5);
-            if (i < getMinimum()) {
-                return getMinimum();
-            } else if (i > getMaximum()) {
-                return getMaximum();
-            } else {
-                return i;
-            }
+            return Utils.clamp(i, getMinimum(), getMaximum());
         }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1502 +1502 @@
         }
     }
+
+    /**
+     * Clamp a integer value to the given range
+     * @param val The value
+     * @param min minimum value
+     * @param max maximum value
+     * @return the value
+     * @since 11053
+     */
+    public static int clamp(int val, int min, int max) {
+        if (val < min) {
+            return min;
+        } else if (val > max) {
+            return max;
+        } else {
+            return val;
+        }
+    }
 }