Changeset 14248 in josm for trunk/src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java (modified) (2 diffs)

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());
+            }
         }
     }