Changeset 5960 in josm for trunk/src

Timestamp:

2013-05-14T21:33:44+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8710 - Inconsistent MapMode focus behaviour: fix core mapmodes

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• ExtrudeAction.java (modified) (1 diff)
• MapMode.java (modified) (3 diffs)
• ParallelWayAction.java (modified) (1 diff)
• PlayHeadDragMode.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -237 +237 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-
+        
+        requestFocusInMapView();
         updateKeyModifiers(e);
         

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -49 +49 @@
     }
 
+    /**
+     * Makes this map mode active.
+     */
     public void enterMode() {
         putValue("active", true);
@@ -54 +57 @@
         updateStatusLine();
     }
+    
+    /**
+     * Makes this map mode inactive.
+     */
     public void exitMode() {
         putValue("active", false);
@@ -95 +102 @@
         shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
     }
+    
+    protected void requestFocusInMapView() {
+        if (isEnabled()) {
+            // request focus in order to enable the expected keyboard shortcuts (see #8710)
+            Main.map.mapView.requestFocus();
+        }
+    }
 
-    public void mouseReleased(MouseEvent e) {}
+    public void mouseReleased(MouseEvent e) {requestFocusInMapView();}
     public void mouseExited(MouseEvent e) {}
-    public void mousePressed(MouseEvent e) {}
+    public void mousePressed(MouseEvent e) {requestFocusInMapView();}
     public void mouseClicked(MouseEvent e) {}
     public void mouseEntered(MouseEvent e) {}

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -291 +291 @@
     @Override
     public void mousePressed(MouseEvent e) {
+        requestFocusInMapView();
         updateModifiersState(e);
         // Other buttons are off limit, but we still get events.

trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java

@@ -25 +25 @@
     private PlayHeadMarker playHeadMarker = null;
 
+    /**
+     * Constructs a new {@code PlayHeadDragMode}.
+     * @param m Audio marker
+     */
     public PlayHeadDragMode(PlayHeadMarker m) {
         super(tr("Drag play head"), "playheaddrag", tr("Drag play head"), null,
@@ -68 +72 @@
             return;
 
+        requestFocusInMapView();
         updateKeyModifiers(ev);