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

Timestamp:

2013-01-10T01:57:33+01:00 (12 years ago)

Author:

Don-vip

Message:

Scrollable menus: update MenuScroller to last version + add mouse wheel scroll support + reset scroller when imagery menu is refreshed

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (1 diff)
• MenuScroller.java (modified) (10 diffs)

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

@@ -70 +70 @@
     private Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
     private int offsPos;
+    private MenuScroller menuScroller;
 
     public ImageryMenu() {
         super(tr("Imagery"));
+        setupMenuScroller();
+        MapView.addLayerChangeListener(this);
+    }
+    
+    private final void setupMenuScroller() {
         int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
         int menuItemHeight = singleOffset.getPreferredSize().height;
-        MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
-        MapView.addLayerChangeListener(this);
+        menuScroller = MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
     }
 
     public void refreshImageryMenu() {
+        if (menuScroller != null) {
+            menuScroller.dispose();
+            menuScroller = null;
+        }
+        setupMenuScroller();
         removeAll();
 

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

@@ -1 +1 @@
 /**
- * @(#)MenuScroller.java        1.4.0 14/09/10
+ * @(#)MenuScroller.java    1.5.0 04/02/12
  */
 package org.openstreetmap.josm.gui;
@@ -10 +10 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+
 import javax.swing.Icon;
 import javax.swing.JComponent;
@@ -15 +18 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
 import javax.swing.MenuSelectionManager;
 import javax.swing.Timer;
@@ -41 +43 @@
     private MenuScrollItem downItem;
     private final MenuScrollListener menuListener = new MenuScrollListener();
+    private final MouseWheelListener mouseWheelListener = new MouseScrollListener();
     private int scrollCount;
     private int interval;
@@ -293 +296 @@
         this.menu = menu;
         menu.addPopupMenuListener(menuListener);
+        menu.addMouseWheelListener(mouseWheelListener);
     }
 
@@ -419 +423 @@
         if (menu != null) {
             menu.removePopupMenuListener(menuListener);
+            menu.removeMouseWheelListener(mouseWheelListener);
+            menu.setPreferredSize(null);
             menu = null;
         }
@@ -448 +454 @@
             }
             if (topFixedCount > 0) {
-                menu.add(new JSeparator());
+                menu.addSeparator();
             }
 
@@ -458 +464 @@
 
             if (bottomFixedCount > 0) {
-                menu.add(new JSeparator());
+                menu.addSeparator();
             }
             for (int i = menuItems.length - bottomFixedCount; i < menuItems.length; i++) {
@@ -475 +481 @@
         }
     }
-
+    
     private class MenuScrollListener implements PopupMenuListener {
 
@@ -590 +596 @@
         }
     }
+    
+    private class MouseScrollListener implements MouseWheelListener {
+        public void mouseWheelMoved(MouseWheelEvent mwe) {
+            if (menu.getComponents().length > scrollCount) {
+                firstIndex += mwe.getWheelRotation();
+                refreshMenu();
+            }
+            mwe.consume(); // (Comment 16, Huw)
+        }
+    }
 }