Changeset 13154 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-11-23T22:10:26+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #13883, fix #15586 - better fix for #13883, without breaking panning on macOS

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (8 diffs)
• MapView.java (modified) (1 diff)
• NavigatableComponent.java (modified) (1 diff)

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

@@ -14 +14 @@
 import java.awt.Font;
 import java.awt.GridBagLayout;
+import java.awt.MouseInfo;
 import java.awt.Point;
+import java.awt.PointerInfo;
 import java.awt.SystemColor;
 import java.awt.Toolkit;
@@ -76 +78 @@
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -107 +110 @@
  */
 public final class MapStatus extends JPanel implements
-    Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener, SelectionChangedListener {
+    Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener, SelectionChangedListener, ZoomChangeListener {
 
     private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(Config.getPref().get("statusbar.decimal-format", "0.0"));
@@ -882 +885 @@
                 if (mv.getCenter() == null)
                     return;
-                // Do not update the view if ctrl is pressed.
-                if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
-                    ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat();
-                    LatLon p = mv.getLatLon(e.getX(), e.getY());
-                    latText.setText(mCord.latToString(p));
-                    lonText.setText(mCord.lonToString(p));
-                    if (Objects.equals(previousCoordinateFormat, mCord)) {
-                        // do nothing
-                    } else if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) {
-                        latText.setIcon("northing");
-                        lonText.setIcon("easting");
-                        latText.setToolTipText(tr("The northing at the mouse pointer."));
-                        lonText.setToolTipText(tr("The easting at the mouse pointer."));
-                        previousCoordinateFormat = mCord;
-                    } else {
-                        latText.setIcon("lat");
-                        lonText.setIcon("lon");
-                        latText.setToolTipText(tr("The geographic latitude at the mouse pointer."));
-                        lonText.setToolTipText(tr("The geographic longitude at the mouse pointer."));
-                        previousCoordinateFormat = mCord;
-                    }
+                // Do not update the view if ctrl or right button is pressed.
+                if ((e.getModifiersEx() & (MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK)) == 0) {
+                    updateLatLonText(e.getX(), e.getY());
                 }
             }
@@ -938 +923 @@
 
         SystemOfMeasurement.addSoMChangeListener(this);
+        NavigatableComponent.addZoomChangeListener(this);
 
         latText.addMouseListener(jumpToOnLeftClick);
@@ -969 +955 @@
         thread.setDaemon(true);
         thread.start();
+    }
+
+    private void updateLatLonText(int x, int y) {
+        LatLon p = mv.getLatLon(x, y);
+        ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat();
+        latText.setText(mCord.latToString(p));
+        lonText.setText(mCord.lonToString(p));
+        if (Objects.equals(previousCoordinateFormat, mCord)) {
+            // do nothing
+        } else if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) {
+            latText.setIcon("northing");
+            lonText.setIcon("easting");
+            latText.setToolTipText(tr("The northing at the mouse pointer."));
+            lonText.setToolTipText(tr("The easting at the mouse pointer."));
+            previousCoordinateFormat = mCord;
+        } else {
+            latText.setIcon("lat");
+            lonText.setIcon("lon");
+            latText.setToolTipText(tr("The geographic latitude at the mouse pointer."));
+            lonText.setToolTipText(tr("The geographic longitude at the mouse pointer."));
+            previousCoordinateFormat = mCord;
+        }
     }
 
@@ -1115 +1123 @@
     public void destroy() {
         SystemOfMeasurement.removeSoMChangeListener(this);
+        NavigatableComponent.removeZoomChangeListener(this);
         Config.getPref().removePreferenceChangeListener(this);
         SelectionEventManager.getInstance().removeSelectionListener(this);
@@ -1181 +1190 @@
         setDist(new SubclassFilteredCollection<OsmPrimitive, Way>(newSelection, Way.class::isInstance));
     }
+
+    @Override
+    public void zoomChanged() {
+        PointerInfo pointerInfo = MouseInfo.getPointerInfo();
+        if (pointerInfo != null) {
+            Point mp = pointerInfo.getLocation();
+            updateLatLonText(mp.x, mp.y);
+        }
+    }
 }

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

@@ -910 +910 @@
     }
 
-    @Override
-    protected void refreshMouse() {
-        if (lastMEvent.getWhen() > 0) {
-            // This fake movement allows to keep consistent state between mouse position and hilighted primitives, status bar, etc.
-            // When the map is not moved by mouse (for example with keyboard shortcuts)
-            dispatchEvent(new MouseEvent(this, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), 0,
-                    lastMEvent.getX(), lastMEvent.getY(), 0, false));
-        }
-    }
-
     /**
      * Returns the layer manager.

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

@@ -697 +697 @@
         if (!initial) {
             repaint();
-            refreshMouse();
             fireZoomChanged();
         }
-    }
-
-    protected void refreshMouse() {
-        // To be overriden by subclasses handling mouse events
     }