Changeset 2519 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2009-11-27T12:57:56+01:00 (14 years ago)

Author:

stoecker

Message:

fixed 3660 - resize in slippy map downloader failed

File:

• trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -53 +53 @@
     // standard dimension
     private Dimension iDownloadDialogDimension;
-    // screen size
-    private Dimension iScreenSize;
 
     private TileSource[] sources = { new OsmTileSource.Mapnik(), new OsmTileSource.TilesAtHome(),
@@ -240 +238 @@
      */
     public void resizeSlippyMap() {
-        if (iScreenSize == null) {
-            Component c = iGui.getParent().getParent().getParent().getParent().getParent().getParent().getParent()
-            .getParent().getParent();
-            // remember the initial set screen dimensions
-            iDownloadDialogDimension = c.getSize();
-            // retrive the size of the display
-            iScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        }
-
-        // resize
-        Component co = iGui.getParent().getParent().getParent().getParent().getParent().getParent().getParent()
-        .getParent().getParent();
-        Dimension currentDimension = co.getSize();
-
+        Dimension iScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
         // enlarge
-        if (currentDimension.equals(iDownloadDialogDimension)) {
+        if(iDownloadDialogDimension == null) {
+            iDownloadDialogDimension = iGui.getSize();
             // make the each dimension 90% of the absolute display size and
             // center the DownloadDialog
+            // retrieve the size of the display
             int w = iScreenSize.width * 90 / 100;
             int h = iScreenSize.height * 90 / 100;
-            co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
-
+            iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
         }
         // shrink
@@ -269 +255 @@
             int w = iDownloadDialogDimension.width;
             int h = iDownloadDialogDimension.height;
-            co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
-
+            iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
+            iDownloadDialogDimension = null;
         }