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

Timestamp:

2017-05-15T19:29:29+02:00 (7 years ago)

Author:

michael2402

Message:

Move viewport following option to DrawAction and make it persistent.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/FollowLineAction.java (modified) (1 diff)
• actions/ViewportFollowToggleAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (2 diffs)
• gui/MapView.java (modified) (2 diffs)

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

@@ -121 +121 @@
             // "viewport following" mode for tracing long features
             // from aerial imagery or GPS tracks.
-            if (Main.map.mapView.viewportFollowing) {
+            if (DrawAction.VIEWPORT_FOLLOWING.get()) {
                 Main.map.mapView.smoothScrollTo(newPoint.getEastNorth());
             }

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -36 +37 @@
     public void actionPerformed(ActionEvent e) {
         toggleSelectedState(e);
-        Main.map.mapView.viewportFollowing = isSelected();
+        DrawAction.VIEWPORT_FOLLOWING.put(isSelected());
         notifySelectedState();
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -74 +74 @@
 public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, KeyPressReleaseListener, ModifierListener {
 
+    /**
+     * If this property is set, the draw action moves the viewport when adding new points.
+     * @since 12182
+     */
+    public static final CachingProperty<Boolean> VIEWPORT_FOLLOWING = new BooleanProperty("draw.viewport.following", false).cached();
+
     private static final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(), Color.ORANGE.getGreen(), Color.ORANGE.getBlue(), 128);
 
@@ -614 +620 @@
         // "viewport following" mode for tracing long features
         // from aerial imagery or GPS tracks.
-        if (Main.map.mapView.viewportFollowing) {
+        if (VIEWPORT_FOLLOWING.get()) {
             Main.map.mapView.smoothScrollTo(n.getEastNorth());
         }

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

@@ -36 +36 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
@@ -184 +185 @@
     }
 
+    /**
+     * Replaced by the {@link DrawAction#VIEWPORT_FOLLOWING} property
+     * @deprecated since 12180. Can be remove soon (does any plugin even use this?)
+     */
+    @Deprecated
     public boolean viewportFollowing;