Changeset 7606 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-10-07T02:37:12+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10592 - fix other shortcuts

File:

• trunk/src/org/openstreetmap/josm/gui/MapMover.java (modified) (1 diff)

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

@@ -116 +116 @@
             contentPane.getActionMap().put("MapMover.Zoomer.down", new ZoomerAction("down"));
 
-            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL).getKeyStroke(),
-                "MapMover.Zoomer.in");
-            contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(","));
-
-            contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL).getKeyStroke(),
-                "MapMover.Zoomer.out");
-            contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction("."));
+            // see #10592 - Disable these alternate shortcuts on OS X because of conflict with system shortcut
+            if (!Main.isPlatformOsx()) {
+                contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+                    Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL).getKeyStroke(),
+                    "MapMover.Zoomer.in");
+                contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(","));
+
+                contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
+                    Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL).getKeyStroke(),
+                    "MapMover.Zoomer.out");
+                contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction("."));
+            }
         }
     }