Changeset 6098 in josm for trunk/src

Timestamp:

2013-08-02T07:00:57+02:00 (11 years ago)

Author:

akks

Message:

see #6355: do not create "Imagery/More" submenu if there is enough space on screen

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (1 diff)

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

@@ -164 +164 @@
 
         addDynamicSeparator();
-        addDynamic(Main.main.menu.imagerySubMenu);
+        JMenu subMenu = Main.main.menu.imagerySubMenu;
+        int heightUnrolled = 30*(getItemCount()+subMenu.getItemCount());
+        if (heightUnrolled < Main.panel.getHeight()) {
+            // add all items of submenu if they will fit on screen
+            int n = subMenu.getItemCount();
+            for (int i=0; i<n; i++) {
+                addDynamic(subMenu.getItem(i).getAction());
+            }
+        } else {
+            // or add the submenu itself
+            addDynamic(subMenu);
+        }
     }