Changeset 15734 in josm for trunk/src/org

Timestamp:

2020-01-19T21:21:54+01:00 (5 years ago)

Author:

simon04

Message:

see #17220 - LayerListDialog: re-enable previous offset on click

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (2 diffs)
• layer/imagery/TileSourceDisplaySettings.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -655 +655 @@
                 final TileSourceDisplaySettings displaySettings = ((AbstractTileSourceLayer<?>) layer).getDisplaySettings();
                 if (EastNorth.ZERO.equals(displaySettings.getDisplacement())) {
+                    final boolean hasPreviousOffset = displaySettings.getPreviousOffsetBookmark() != null;
                     cb.setSelected(false);
-                    cb.setEnabled(false); // TODO: allow reselecting checkbox and thereby setting the old offset again
-                    cb.setToolTipText(tr("layer is without a user-defined offset"));
+                    cb.setEnabled(hasPreviousOffset);
+                    cb.setToolTipText(tr("layer is without a user-defined offset") +
+                            (hasPreviousOffset ? " " + tr("(click to activate previous offset)") : ""));
                 } else {
                     cb.setSelected(true);
@@ -1126 +1128 @@
                     // reset layer offset
                     if (l instanceof AbstractTileSourceLayer<?>) {
-                        AbstractTileSourceLayer<?> abstractTileSourceLayer = (AbstractTileSourceLayer<?>) l;
-                        OffsetBookmark offsetBookmark = abstractTileSourceLayer.getDisplaySettings().getOffsetBookmark();
+                        final TileSourceDisplaySettings displaySettings = ((AbstractTileSourceLayer<?>) l).getDisplaySettings();
+                        final OffsetBookmark offsetBookmark = displaySettings.getOffsetBookmark();
                         if (offsetBookmark != null) {
-                            abstractTileSourceLayer.getDisplaySettings().setOffsetBookmark(null);
+                            displaySettings.setOffsetBookmark(null);
                             MainApplication.getMenu().imageryMenu.refreshOffsetMenu();
+                        } else {
+                            displaySettings.setOffsetBookmark(displaySettings.getPreviousOffsetBookmark());
                         }
                     }

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -67 +67 @@
     private boolean showErrors;
 
+    private OffsetBookmark previousOffsetBookmark;
     private OffsetBookmark offsetBookmark;
     /**
@@ -216 +217 @@
      */
     public void setOffsetBookmark(OffsetBookmark offsetBookmark) {
+        if (this.offsetBookmark != null) {
+            this.previousOffsetBookmark = this.offsetBookmark;
+        }
         this.offsetBookmark = offsetBookmark;
         if (offsetBookmark == null) {
@@ -230 +234 @@
     public OffsetBookmark getOffsetBookmark() {
         return this.offsetBookmark;
+    }
+
+    /**
+     * Gets the offset bookmark previously in use.
+     * @return the previously used offset bookmark, may be null
+     */
+    public OffsetBookmark getPreviousOffsetBookmark() {
+        return previousOffsetBookmark;
     }