Changeset 6019 in josm for trunk/src/org

Timestamp:

2013-06-24T16:15:44+02:00 (11 years ago)

Author:

akks

Message:

see #8652: do not shift the map on screen when toggling panels by Tab [idea by andygol]

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DialogsToggleAction.java (modified) (1 diff)
• gui/MapView.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

@@ -82 +82 @@
                 Main.pref.put("sidetoolbar.visible", selected);
             }
+            Main.map.mapView.rememberLastPositionOnScreen();
         }
     }

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

@@ -6 +6 @@
 import java.awt.AlphaComposite;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -41 +42 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -281 +283 @@
     }
 
+    // remebered geometry of the component
+    private Dimension oldSize = null;
+    private Point oldLoc = null;
+    
+    /*
+     * Call this method to keep map position on screen during next repaint
+     */
+    public void rememberLastPositionOnScreen() {
+        oldSize = getSize();
+        oldLoc  = getLocationOnScreen();
+    }
+    
     /**
      * Adds a GPX layer. A GPX layer is added below the lowest data layer.
@@ -526 +540 @@
             return; // no data loaded yet.
 
+        // if the position was remembered, we need to adjust center once before repainting
+        if (oldLoc != null && oldSize != null) {
+            Point l1  = getLocationOnScreen();
+            final EastNorth newCenter = new EastNorth(
+                    center.getX()+ (l1.x-oldLoc.x - (oldSize.width-getWidth())/2.0)*getScale(),
+                    center.getY()+ (oldLoc.y-l1.y + (oldSize.height-getHeight())/2.0)*getScale()
+                    );
+            oldLoc = null; oldSize = null;
+            zoomTo(newCenter);
+        }
+        
         List<Layer> visibleLayers = getVisibleLayersInZOrder();