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

Timestamp:

2017-11-18T23:51:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #11217 - forward note tooltips mouse wheel scroll events to map frame

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (3 diffs)
• layer/NoteLayer.java (modified) (3 diffs)

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

@@ -41 +41 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.ViewportData;
@@ -77 +75 @@
 import org.openstreetmap.josm.io.audio.AudioPlayer;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -928 +928 @@
         initialViewport = viewportData;
     }
+
+    /**
+     * Returns the internal {@link MapMover}.
+     * @return the internal {@code MapMover}
+     * @since 13126
+     */
+    public final MapMover getMapMover() {
+        return mapMover;
+    }
 }

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

@@ -11 +11 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 import java.io.File;
 import java.text.DateFormat;
@@ -173 +175 @@
         if (displayedWindow != null) {
             displayedWindow.setVisible(false);
+            for (MouseWheelListener listener : displayedWindow.getMouseWheelListeners()) {
+                displayedWindow.removeMouseWheelListener(listener);
+            }
             displayedWindow.dispose();
             displayedWindow = null;
@@ -207 +212 @@
             displayedWindow.setAutoRequestFocus(false);
             displayedWindow.add(displayedPanel);
+            // Forward mouse wheel scroll event to MapMover
+            displayedWindow.addMouseWheelListener(e -> mv.getMapMover().mouseWheelMoved(
+                    (MouseWheelEvent) SwingUtilities.convertMouseEvent(displayedWindow, e, mv)));
         } else {
             displayedPanel.setText(text);