Changeset 11206 in josm for trunk

Timestamp:

2016-11-01T11:17:36+01:00 (8 years ago)

Author:

michael2402

Message:

Fix #13703: Layer visibility popup: Improve mouse wheel hit boxes and make visibility slider more intuitive.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (modified) (6 diffs)

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

@@ -61 +61 @@
         this.model = model;
         popup = new JPopupMenu();
+        // prevent popup close on mouse wheel move
+        popup.addMouseWheelListener(MouseWheelEvent::consume);
 
         // just to add a border
@@ -82 +84 @@
 
     private void addSlider(JPanel content, FilterSlider<?> slider) {
-        content.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
-        content.add(new JLabel(slider.getLabel()), GBC.eol());
-        content.add(slider, GBC.eop());
+        // wrap to a common content pane to allow for mouse wheel listener on label.
+        JPanel container = new JPanel(new GridBagLayout());
+        container.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
+        container.add(new JLabel(slider.getLabel()), GBC.eol());
+        container.add(slider, GBC.eol());
+        content.add(container, GBC.eop());
+
+        container.addMouseWheelListener(slider::mouseWheelMoved);
         sliders.add(slider);
     }
@@ -177 +184 @@
 
             addChangeListener(e -> onStateChanged());
-            addMouseWheelListener(this::mouseWheelMoved);
         }
 
@@ -193 +199 @@
 
         protected void mouseWheelMoved(MouseWheelEvent e) {
+            e.consume();
+            if (!isEnabled()) {
+                // ignore mouse wheel in disabled state.
+                return;
+            }
             double rotation = e.getPreciseWheelRotation();
             double destinationValue = getValue() + rotation * SLIDER_WHEEL_INCREMENT;
@@ -201 +212 @@
             }
             setValue(Utils.clamp((int) destinationValue, getMinimum(), getMaximum()));
-            e.consume();
         }
 
@@ -271 +281 @@
 
         @Override
+        protected void mouseWheelMoved(MouseWheelEvent e) {
+            if (!isEnabled() && !filterLayers(model.getSelectedLayers()).isEmpty() && e.getPreciseWheelRotation() > 0) {
+                // make layer visible and set the value.
+                // this allows users to use the mouse wheel to make the layer visible if it was hidden previously.
+                e.consume();
+                setVisibleFlag(true);
+                setRealValue(0.05);
+            } else {
+                super.mouseWheelMoved(e);
+            }
+        }
+
+        @Override
         protected void applyValueToLayer(Layer layer) {
             layer.setOpacity(getRealValue());