Changeset 18937 in josm for trunk/src/org

Timestamp:

2024-01-15T20:25:02+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23415 and #23414, patch 23415-v2.patch

• fixes issues where the wrong image is shown
• properly destroys the toggle dialog and the toggle action when no more geotagged image layer is available
• make sure that the title is updated when no image is selected (instead of possibly showing an image name from a closed layer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -147 +147 @@
         MapFrame map = MainApplication.getMap();
         synchronized (ImageViewerDialog.class) {
-            if (dialog != null && map != null && map.getToggleDialog(ImageViewerDialog.class) != null) {
-                map.removeToggleDialog(dialog);
+            if (dialog != null) {
+                if (map != null && map.getToggleDialog(ImageViewerDialog.class) != null) {
+                    map.removeToggleDialog(dialog);
+                }
+                dialog.destroy();
             }
         }
@@ -181 +184 @@
             // We need to check to see whether or not the worker is shut down. See #22922 for details.
             if (!MainApplication.worker.isShutdown() && this.isDialogShowing()) {
-                MainApplication.worker.execute(() -> GuiHelper.runInEDT(() -> {
-                    Component selected = this.layers.getSelectedComponent();
-                    if (selected instanceof MoveImgDisplayPanel) {
-                        ((MoveImgDisplayPanel<?>) selected).fireModelUpdate();
-                    }
-                }));
+                MainApplication.worker.execute(() -> GuiHelper.runInEDT(this::showNotify));
             }
         });
@@ -303 +301 @@
         if (geoImageLayers.isEmpty()) {
             this.layers.setVisible(false);
+            hideNotify();
+            if (hasInstance())
+                destroyInstance();
         } else {
             this.layers.setVisible(true);
@@ -315 +316 @@
                 this.getImageTabs().filter(m -> m.layer.containsImage(this.currentEntry)).mapToInt(this.layers::indexOfComponent).findFirst()
                         .ifPresent(this.layers::setSelectedIndex);
+            } else if (selected == null) {
+                updateTitle();
             }
             this.layers.invalidate();
@@ -352 +355 @@
                             removeImageTab(((MoveImgDisplayPanel<?>) layers.getComponentAt(index)).layer);
                             getImageTabs().forEach(m -> m.setVisible(m.isVisible()));
+                            showNotify();
                             return;
                         }
@@ -417 +421 @@
         imageRemoveFromDiskAction.destroy();
         imageZoomAction.destroy();
+        toggleAction.destroy();
         cancelLoadingImage();
         super.destroy();
-        destroyInstance();
     }
 
@@ -1066 +1070 @@
             btnCollapse.setVisible(!isDocked);
         }
-        this.updateLayers(true);
     }