Changeset 4336 in josm for trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

Timestamp:

2011-08-25T23:58:48+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6720 - slippy map download not refreshed, improve resize handling for slippy map downloader

File:

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

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

@@ -4 +4 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Toolkit;
 
 import java.beans.PropertyChangeEvent;
@@ -24 +28 @@
     private DownloadDialog iGui;
     private SlippyMapBBoxChooser pnlSlippyMapBBoxChooser;
+    // standard dimension
+    private Dimension iDownloadDialogDimension;
 
     /**
@@ -35 +41 @@
     public void addGui(final DownloadDialog gui) {
         iGui = gui;
-        pnlSlippyMapBBoxChooser.setGui(iGui);
         iGui.addDownloadAreaSelector(pnlSlippyMapBBoxChooser, tr("Slippy map"));
     }
@@ -41 +46 @@
     public void setDownloadArea(Bounds area) {
         pnlSlippyMapBBoxChooser.setBoundingBox(area);
+        repaint();
     }
 
@@ -48 +54 @@
                 iGui.boundingBoxChanged((Bounds)evt.getNewValue(), this);
             }
+        } else if(evt.getPropertyName().equals(SlippyMapBBoxChooser.RESIZE_PROP)) {
+            int w, h;
+
+            // retrieve the size of the display
+            Dimension iScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+            // enlarge
+            if(iDownloadDialogDimension == null) {
+                // make the each dimension 90% of the absolute display size
+                w = iScreenSize.width * 90 / 100;
+                h = iScreenSize.height * 90 / 100;
+                iDownloadDialogDimension = iGui.getSize(); 
+            }
+            // shrink
+            else {
+                // set the size back to the initial dimensions
+                w = iDownloadDialogDimension.width;
+                h = iDownloadDialogDimension.height;
+                iDownloadDialogDimension = null;
+            }
+
+            // resize and center the DownloadDialog 
+            iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h); 
+            repaint();
         }
     }