Ticket #12539: ZoomReverseWheel.patch

src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

@@ -82 +82 @@
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
         if (wheelZoomEnabled) {
-            map.setZoom(map.getZoom() - e.getWheelRotation(), e.getPoint());
+            int rotation = JMapViewer.zoomReverseWheel ? -e.getWheelRotation() : e.getWheelRotation();
+            map.setZoom(map.getZoom() - rotation, e.getPoint());
         }
     }
 

src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -46 +46 @@
     /** whether debug mode is enabled or not */
     public static boolean debug;
 
+    /** option to reverse zoom direction with mouse wheel */
+    public static boolean zoomReverseWheel;
+
     /**
      * Vectors for clock-wise tile painting
      */

src/org/openstreetmap/josm/gui/MapMover.java

@@ -20 +20 @@
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -34 +39 @@
  */
 public class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener, Destroyable {
 
+    public static final BooleanProperty PROP_ZOOM_REVERSE_WHEEL = new BooleanProperty("zoom.reverse-wheel", false);
+
+    private static final JMapViewerUpdater jMapViewerUpdater = new JMapViewerUpdater();
+
+    private static class JMapViewerUpdater implements PreferenceChangedListener {
+
+        JMapViewerUpdater() {
+            Main.pref.addPreferenceChangeListener(this);
+            updateJMapViewer();
+        }
+
+        @Override
+        public void preferenceChanged(PreferenceChangeEvent e) {
+            if (MapMover.PROP_ZOOM_REVERSE_WHEEL.getKey().equals(e.getKey())) {
+                updateJMapViewer();
+            }
+        }
+
+        private void updateJMapViewer() {
+            JMapViewer.zoomReverseWheel = MapMover.PROP_ZOOM_REVERSE_WHEEL.get();
+        }
+    }
+
     private final class ZoomerAction extends AbstractAction {
         private final String action;
 
@@ -213 +241 @@
      */
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
-        nc.zoomManyTimes(e.getX(), e.getY(), e.getWheelRotation());
+        int rotation = PROP_ZOOM_REVERSE_WHEEL.get() ? -e.getWheelRotation() : e.getWheelRotation();
+        nc.zoomManyTimes(e.getX(), e.getY(), rotation);
     }
 
     /**

src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.gui.MapMover;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -61 +62 @@
     private final JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus"));
     private final JCheckBox isoDates = new JCheckBox(tr("Display ISO dates"));
     private final JCheckBox nativeFileChoosers = new JCheckBox(tr("Use native file choosers (nicer, but do not support file filters)"));
+    private final JCheckBox zoomReverseWheel = new JCheckBox(tr("Reverse zoom with mouse wheel"));
 
     @Override
     public void addGui(PreferenceTabbedPane gui) {
@@ -140 +142 @@
         nativeFileChoosers.setSelected(FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get());
         panel.add(nativeFileChoosers, GBC.eop().insets(20, 0, 0, 0));
 
+        zoomReverseWheel.setToolTipText(
+                tr("Check if you feel opposite direction more convenient"));
+        zoomReverseWheel.setSelected(MapMover.PROP_ZOOM_REVERSE_WHEEL.get());
+        panel.add(zoomReverseWheel, GBC.eop().insets(20, 0, 0, 0));
+
         panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
 
         panel.add(new JLabel(tr("Look and Feel")), GBC.std().insets(20, 0, 0, 0));
@@ -161 +168 @@
         Main.pref.put(ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected());
         Main.pref.put(DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected());
         Main.pref.put(FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.getKey(), nativeFileChoosers.isSelected());
+        Main.pref.put(MapMover.PROP_ZOOM_REVERSE_WHEEL.getKey(), zoomReverseWheel.isSelected());
         mod |= Main.pref.put("laf", ((LookAndFeelInfo) lafCombo.getSelectedItem()).getClassName());
         return mod;
     }