Changeset 6020 in josm for trunk/src/org

Timestamp:

2013-06-24T17:32:19+02:00 (11 years ago)

Author:

akks

Message:

see #8652: use Tab for toggling panels even if focus is on toolbar buttons or scaling slider

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (6 diffs)
• MapView.java (modified) (4 diffs)
• preferences/ToolbarPreferences.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.awt.Font;
 import java.awt.GridBagLayout;
-import java.awt.KeyboardFocusManager;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -19 +18 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -76 +74 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
 
 
@@ -145 +144 @@
     private final DialogsPanel dialogsPanel;
 
+    private final boolean unregisterTab;
+    
     /**
      * Default width of the toggle dialog area.
@@ -237 +238 @@
         statusLine = new MapStatus(this);
         MapView.addLayerChangeListener(this);
+
+        unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
+        if (unregisterTab) {
+            for (JComponent c: allDialogButtons) c.setFocusTraversalKeysEnabled(false);
+            for (JComponent c: allMapModeButtons) c.setFocusTraversalKeysEnabled(false);
+        }
     }
 
@@ -404 +411 @@
             toolBarActions.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarActions);
-        listAllMapModesButton.setAlignmentX(0.5f);
-        listAllMapModesButton.setBorder(null);
-        listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
+            listAllMapModesButton.setAlignmentX(0.5f);
+            listAllMapModesButton.setBorder(null);
+            listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
             listAllMapModesButton.setInheritsPopupMenu(true);
             sideToolBar.add(listAllMapModesButton);

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

@@ -6 +6 @@
 import java.awt.AlphaComposite;
 import java.awt.Color;
+
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -229 +230 @@
     public MapView(final JPanel contentPane, final ViewportData viewportData) {
         Main.pref.addPreferenceChangeListener(this);
+        final boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
 
         addComponentListener(new ComponentAdapter(){
@@ -237 +239 @@
                 add(zoomSlider);
                 zoomSlider.setBounds(3, 0, 114, 30);
+                zoomSlider.setFocusTraversalKeysEnabled(!unregisterTab);
 
                 MapScaler scaler = new MapScaler(MapView.this);
@@ -277 +280 @@
         });
 
-        if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null)
-        {
+        if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null) {
             setFocusTraversalKeysEnabled(false);
         }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -1024 +1024 @@
         control.removeAll();
         buttonActions.clear();
+        boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
 
         for (ActionDefinition action : getDefinedActions()) {
@@ -1048 +1049 @@
                 }
                 b.setInheritsPopupMenu(true);
-            }
-        }
+                b.setFocusTraversalKeysEnabled(!unregisterTab);
+            }
+        }
+        control.setFocusTraversalKeysEnabled(!unregisterTab);
         control.setVisible(control.getComponentCount() != 0);
     }