Changeset 14248 in josm for trunk/src

Timestamp:

2018-09-13T22:48:54+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16730 - make sure we try to display popup menus only if their parent is visible on screen

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/RecentRelationsAction.java (modified) (1 diff)
• gui/ImageryMenu.java (modified) (1 diff)
• gui/MapFrame.java (modified) (1 diff)
• gui/dialogs/layer/LayerVisibilityAction.java (modified) (2 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/download/UserQueryList.java (modified) (1 diff)
• gui/history/OpenChangesetPopupMenu.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• gui/preferences/advanced/AdvancedPreference.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetMenu.java (modified) (1 diff)
• gui/util/MultikeyActionsHandler.java (modified) (2 diffs)
• gui/widgets/PopupMenuButton.java (modified) (1 diff)
• gui/widgets/PopupMenuLauncher.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -159 +159 @@
 
         static void launch(Component parent, KeyStroke keystroke) {
-            Rectangle r = parent.getBounds();
-            new RecentRelationsPopupMenu(getRecentRelationsOnActiveLayer(), keystroke).show(parent, r.x, r.y + r.height);
+            if (parent.isShowing()) {
+                Rectangle r = parent.getBounds();
+                new RecentRelationsPopupMenu(getRecentRelationsOnActiveLayer(), keystroke).show(parent, r.x, r.y + r.height);
+            }
         }
     }

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

@@ -72 +72 @@
                     ((JMenuItem) c).getAction().actionPerformed(e);
                 } else {
-                    if (source == null) return;
+                    if (source == null || !source.isShowing()) return;
                     popup.show(source, source.getWidth()/2, source.getHeight()/2);
                 }

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

@@ -682 +682 @@
                 }));
             }
-            if (button != null) {
+            if (button != null && button.isShowing()) {
                 Rectangle bounds = button.getBounds();
                 menu.show(button, bounds.x + bounds.width, 0);

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -35 +35 @@
 
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
@@ -113 +114 @@
         updateValues();
         if (e.getSource() == sideButton) {
-            popup.show(sideButton, 0, sideButton.getHeight());
+            if (sideButton.isShowing()) {
+                popup.show(sideButton, 0, sideButton.getHeight());
+            }
         } else {
             // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden).
             // In that case, show it in the middle of screen (because opacityButton is not visible)
-            popup.show(MainApplication.getMainFrame(),
-                    MainApplication.getMainFrame().getWidth() / 2,
-                    (MainApplication.getMainFrame().getHeight() - popup.getHeight()) / 2);
+            MainFrame mainFrame = MainApplication.getMainFrame();
+            if (mainFrame.isShowing()) {
+                popup.show(mainFrame, mainFrame.getWidth() / 2, (mainFrame.getHeight() - popup.getHeight()) / 2);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -967 +967 @@
                             action.actionPerformed(null);
                             if (SwingUtilities.isRightMouseButton(e)) {
-                                new TagPopupMenu(t).show(e.getComponent(), e.getX(), e.getY());
+                                Component component = e.getComponent();
+                                if (component.isShowing()) {
+                                    new TagPopupMenu(t).show(component, e.getX(), e.getY());
+                                }
                             } else if (e.isShiftDown()) {
                                 // add tags on Shift-Click

trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java

@@ -323 +323 @@
                 if (model.getSize() == 0 || index == -1) {
                     list.clearSelection();
-                    emptySelectionPopup.show(list, e.getX(), e.getY());
+                    if (list.isShowing()) {
+                        emptySelectionPopup.show(list, e.getX(), e.getY());
+                    }
                 } else {
                     list.setSelectedIndex(index);
                     list.ensureIndexIsVisible(index);
-                    elementPopup.show(list, e.getX(), e.getY());
+                    if (list.isShowing()) {
+                        elementPopup.show(list, e.getX(), e.getY());
+                    }
                 }
             }

trunk/src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Container;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -46 +47 @@
      */
     public void show(final JComponent parent) {
-        final Rectangle r = parent.getBounds();
-        show(parent.getParent(), r.x, r.y + r.height);
+        Container parentParent = parent.getParent();
+        if (parentParent.isShowing()) {
+            final Rectangle r = parent.getBounds();
+            show(parentParent, r.x, r.y + r.height);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -191 +192 @@
             if (!isVisible()) return;
             if (e.getButton() == MouseEvent.BUTTON3) {
-                new TileSourceLayerPopup(e.getX(), e.getY()).show(e.getComponent(), e.getX(), e.getY());
+                Component component = e.getComponent();
+                if (component.isShowing()) {
+                    new TileSourceLayerPopup(e.getX(), e.getY()).show(component, e.getX(), e.getY());
+                }
             } else if (e.getButton() == MouseEvent.BUTTON1) {
                 attribution.handleAttribution(e.getPoint(), true);

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -173 +173 @@
         more.addActionListener(new ActionListener() {
             private JPopupMenu menu = buildPopupMenu();
-            @Override public void actionPerformed(ActionEvent ev) {
-                menu.show(more, 0, 0);
+            @Override
+            public void actionPerformed(ActionEvent ev) {
+                if (more.isShowing()) {
+                    menu.show(more, 0, 0);
+                }
             }
         });

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java

@@ -106 +106 @@
                     Point p = pointerInfo.getLocation();
                     MainFrame parent = MainApplication.getMainFrame();
-                    pm.show(parent, p.x-parent.getX(), p.y-parent.getY());
+                    if (parent.isShowing()) {
+                        pm.show(parent, p.x-parent.getX(), p.y-parent.getY());
+                    }
                 }
             } catch (SecurityException ex) {

trunk/src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java

@@ -24 +24 @@
 
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.util.MultikeyShortcutAction.MultikeyInfo;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -101 +102 @@
             }
             layers.addPopupMenuListener(new StatusLinePopupMenuListener());
-            layers.show(MainApplication.getMainFrame(), Integer.MAX_VALUE, Integer.MAX_VALUE);
-            layers.setLocation(MainApplication.getMainFrame().getX() + MainApplication.getMainFrame().getWidth() - layers.getWidth(),
-                               MainApplication.getMainFrame().getY() + MainApplication.getMainFrame().getHeight() - layers.getHeight());
+            MainFrame mainFrame = MainApplication.getMainFrame();
+            if (mainFrame.isShowing()) {
+                layers.show(mainFrame, Integer.MAX_VALUE, Integer.MAX_VALUE);
+                layers.setLocation(mainFrame.getX() + mainFrame.getWidth() - layers.getWidth(),
+                                   mainFrame.getY() + mainFrame.getHeight() - layers.getHeight());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java

@@ -144 +144 @@
      */
     public void setPopupMenu(JPopupMenu m) {
-        this.menu = m;
+        menu = m;
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        this.menu.show(this, 0, this.getHeight());
+        if (isShowing()) {
+            menu.show(this, 0, this.getHeight());
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java

@@ -109 +109 @@
     protected void showMenu(MouseEvent evt) {
         if (menu != null && evt != null) {
-            menu.show(evt.getComponent(), evt.getX(), evt.getY());
+            Component component = evt.getComponent();
+            if (component.isShowing()) {
+                menu.show(component, evt.getX(), evt.getY());
+            }
         }
     }