diff flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java @ 3347:6d749af6a9c2

Issue #726 work. flys-client/trunk@5022 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Tue, 17 Jul 2012 11:45:35 +0000
parents 725470fc57d2
children 61020a61ed38
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Mon Jul 16 08:37:24 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Tue Jul 17 11:45:35 2012 +0000
@@ -2,7 +2,6 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
@@ -86,6 +85,7 @@
     protected ThemePanel themePanel;
     protected Canvas     themePanelCanvas;
     protected Widget     mapPanel;
+    protected Canvas mapPanelCanvas;
 
     protected FloodMap floodMap;
 
@@ -139,21 +139,16 @@
         rootLayout.setMembersMargin(2);
 
         final HLayout hlayout = new HLayout();
-        hlayout.setHeight("*");
-        hlayout.setWidth100();
         hlayout.setMembersMargin(2);
 
         this.themePanelCanvas = createThemePanel();
 
         controlPanel = createControlPanel();
-        mapPanel     = floodMap.getMapWidget();
-        final HorizontalPanel layout = new HorizontalPanel();
-        layout.setWidth("99%");
-        layout.setHeight("99%");
-        layout.add(mapPanel);
-
+        //mapPanel     = new Image();
+        //((Image)mapPanel).setUrl("http://www.hedweb.com/animimag/cool-pony.jpg");
+        mapPanel = floodMap.getMapWidget();
         hlayout.addMember(themePanelCanvas);
-        hlayout.addMember(layout);
+        hlayout.addMember(mapPanel);
 
         rootLayout.addMember(controlPanel);
         rootLayout.addMember(hlayout);
@@ -161,8 +156,9 @@
         hlayout.addResizedHandler(new ResizedHandler() {
             @Override
             public void onResized(ResizedEvent e) {
-                Integer height = hlayout.getHeight();
-                Integer width  = hlayout.getWidth() - themePanelCanvas.getWidth();
+                int height = hlayout.getHeight();
+                int width  = hlayout.getWidth() -
+                        (themePanelCanvas.isVisible() ? themePanelCanvas.getWidth() : 0);
 
                 height = height * 99 / 100;
                 width  = width  * 99 / 100;
@@ -170,7 +166,7 @@
                 String w = String.valueOf(width) + "px";
                 String h = String.valueOf(height) + "px";
 
-                floodMap.setSize(w, h);
+                mapPanel.setSize(w, h);
             }
         });
 
@@ -568,6 +564,8 @@
 
     public void toogleThemePanel() {
         this.themePanelCanvas.setVisible(!themePanelCanvas.isVisible());
+        this.themePanelCanvas.setSize(themePanelCanvas.getWidthAsString(),
+                                      themePanelCanvas.getHeightAsString());
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org