Changeset 7426 in josm for trunk/src

Timestamp:

2014-08-17T01:47:11+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #5816 - Geotagged images dialog docked status not retained (partial revert of r2577)

File:

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

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

@@ -53 +53 @@
     }
 
+    /**
+     * Replies the unique instance of this dialog
+     * @return the unique instance
+     */
     public static ImageViewerDialog getInstance() {
         if (dialog == null)
@@ -66 +70 @@
         super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
-
-        // Don't show a detached dialog right from the start.
-        if (isShowing && !isDocked) {
-            setIsShowing(false);
-        }
 
         JPanel content = new JPanel();
@@ -290 +289 @@
 
     /**
-     * When pressing the Toggle button always show the docked dialog.
-     */
-    @Override
-    protected void toggleButtonHook() {
-        if (! isShowing) {
-            setIsDocked(true);
-            setIsCollapsed(false);
-        }
-    }
-
-    /**
      * When an image is closed, really close it and do not pop
      * up the side dialog.