Changeset 7426 in josm for trunk/src


Ignore:
Timestamp:
2014-08-17T01:47:11+02:00 (5 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r7320 r7426  
    5353    }
    5454
     55    /**
     56     * Replies the unique instance of this dialog
     57     * @return the unique instance
     58     */
    5559    public static ImageViewerDialog getInstance() {
    5660        if (dialog == null)
     
    6670        super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
    6771        tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
    68 
    69         // Don't show a detached dialog right from the start.
    70         if (isShowing && !isDocked) {
    71             setIsShowing(false);
    72         }
    7372
    7473        JPanel content = new JPanel();
     
    290289
    291290    /**
    292      * When pressing the Toggle button always show the docked dialog.
    293      */
    294     @Override
    295     protected void toggleButtonHook() {
    296         if (! isShowing) {
    297             setIsDocked(true);
    298             setIsCollapsed(false);
    299         }
    300     }
    301 
    302     /**
    303291     * When an image is closed, really close it and do not pop
    304292     * up the side dialog.
Note: See TracChangeset for help on using the changeset viewer.