Changeset 5185 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-04-15T00:00:33+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7575 - Non-scrollable menu for Imagery offset

File:

• trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
@@ -23 +24 @@
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 import javax.swing.SwingUtilities;
@@ -34 +36 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.gui.MenuScroller;
 import org.openstreetmap.josm.io.imagery.OffsetServer;
 import org.openstreetmap.josm.io.imagery.OsmosnimkiOffsetServer;
@@ -205 +208 @@
         subMenu.add(new JSeparator());
         boolean hasBookmarks = false;
+        int menuItemHeight = 0;
         for (OffsetBookmark b : OffsetBookmark.allBookmarks) {
             if (!b.isUsable(this)) {
@@ -214 +218 @@
             }
             subMenu.add(item);
+            menuItemHeight = item.getPreferredSize().height;
             hasBookmarks = true;
+        }
+        if (menuItemHeight > 0) {
+                int scrollcount = (Toolkit.getDefaultToolkit().getScreenSize().height / menuItemHeight) - 1;
+                if (subMenu instanceof JMenu) {
+                        MenuScroller.setScrollerFor((JMenu) subMenu, scrollcount);
+                } else if (subMenu instanceof JPopupMenu) {
+                        MenuScroller.setScrollerFor((JPopupMenu)subMenu, scrollcount);
+                }
         }
         return (hasBookmarks || offsetServerSupported) ? subMenu : adjustMenuItem;