Changeset 5050 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-03-08T10:04:21+01:00 (12 years ago)

Author:

akks

Message:

UrlLabel class simplification by Zverik, better label layout in VersionInfoPanel (see #7450, #7326)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (1 diff)
• Map_Rectifier_WMSmenuAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -71 +71 @@
         info.add(GBC.glue(0,10), GBC.eol());
         info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
-        info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(GBC.glue(0,5), GBC.eol());
         info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
-        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eol().fill(GBC.HORIZONTAL));
 
         JTextArea revision = new JTextArea();

trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java

@@ -137 +137 @@
             if(!s.url.equals("")) {
                 panel.add(serviceBtn, GBC.std());
-                panel.add(new UrlLabel(s.url, tr("Visit Homepage")), GBC.eol().anchor(GridBagConstraints.EAST));
+                panel.add(new UrlLabel(s.url, tr("Visit Homepage")), GBC.eol().anchor(GridBagConstraints.EAST), 2);
             } else {
                 panel.add(serviceBtn, GBC.eol().anchor(GridBagConstraints.WEST));

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

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Graphics2D;
+import java.awt.KeyboardFocusManager;
 import java.awt.MenuItem;
 import java.awt.Point;
@@ -39 +41 @@
 
 import java.util.TreeSet;
-import javax.swing.AbstractAction;
-import javax.swing.JOptionPane;
-
-import javax.swing.JPopupMenu;
-import javax.swing.Timer;
+import javax.swing.*;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -224 +222 @@
             return;
         if (event instanceof KeyEvent) {
+            Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+            Component wantedFocus = Main.map.mapView.getParent();
+            boolean foundMapViewAncestor=false;
+            while (focused!=null) {
+                if (focused==wantedFocus) {
+                    foundMapViewAncestor=true;
+                }
+                focused = focused.getParent();
+            }
+            // we accept only events that come from map or toggle dialogs, not from menu and dialogs
+            if (!foundMapViewAncestor) return;
             processKeyEvent((KeyEvent) event);
         } //  toggle angle snapping
@@ -238 +247 @@
     private Timer timer;
     void processKeyEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
+        if (!snappingShortcut.isEvent(e) && !getShortcut().isEvent(e))
             return;
 
@@ -261 +270 @@
 
     private void doKeyPressEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
-            return;
         snapHelper.setFixedMode();
         computeHelperLine();
@@ -268 +275 @@
     }
     private void doKeyReleaseEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
-            return;
         snapHelper.unFixOrTurnOff();
         computeHelperLine();