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

Timestamp:

2016-01-14T23:44:35+01:00 (9 years ago)

Author:

simon04

Message:

fix #12364 - History dialog: fix initial panning to coordinates

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• CoordinateInfoViewer.java (modified) (1 diff)
• HistoryBrowser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -182 +182 @@
     }
 
+    /**
+     * Pans the map to the old+new coordinate
+     * @see JMapViewer#setDisplayToFitMapMarkers()
+     */
+    public void setDisplayToFitMapMarkers() {
+        mapViewer.setDisplayToFitMapMarkers();
+    }
+
     private static class Updater {
         private final transient HistoryBrowserModel model;
         private final PointInTimeType role;
 
-        public Updater(HistoryBrowserModel model, PointInTimeType role) {
+        protected Updater(HistoryBrowserModel model, PointInTimeType role) {
             this.model = model;
             this.role = role;

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -11 +11 @@
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -64 +66 @@
         pnl.setLayout(new BorderLayout());
         pnl.add(tpViewers, BorderLayout.CENTER);
+
+        tpViewers.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (tpViewers.getSelectedComponent() == coordinateInfoViewer) {
+                    // while building the component size is not yet known, thus panning does not give reasonable results
+                    coordinateInfoViewer.setDisplayToFitMapMarkers();
+                }
+            }
+        });
+
         return pnl;
     }