Changeset 7463 in josm for trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

Timestamp:

2014-08-30T01:59:31+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10392 - rework of MenuScroller to replace static scrollCount approach by dynamic behaviour (fix regressions from #10207)

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (4 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.Shape;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -38 +39 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
+/**
+ * Imagery menu, holding entries for imagery preferences, offset actions and dynamic imagery entries
+ * depending on current maview coordinates.
+ * @since 3737
+ */
+public class ImageryMenu extends JMenu implements LayerChangeListener {
 
     private Action offsetAction = new JosmAction(
@@ -83 +89 @@
     private final MapRectifierWMSmenuAction rectaction = new MapRectifierWMSmenuAction();
 
+    /**
+     * Constructs a new {@code ImageryMenu}.
+     * @param subMenu submenu in that contains plugin-managed additional imagery layers
+     */
     public ImageryMenu(JMenu subMenu) {
         super(tr("Imagery"));
@@ -107 +117 @@
     private void setupMenuScroller() {
         if (!GraphicsEnvironment.isHeadless()) {
-            int menuItemHeight = singleOffset.getPreferredSize().height;
-            MenuScroller.setScrollerFor(this, 
-                    MenuScroller.computeScrollCount(this, menuItemHeight));
+            MenuScroller.setScrollerFor(this, 150, 2);
         }
     }