# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1331221169 0
# Node ID 0235cdb62c981a4a196d9d76de45fdc3f6bc279d
# Parent  c1292aab6aa98b185fbf8ed3a011b1e0d2856e00
Issue 563.

Handle the size of the toolbar to show all elements.


flys-client/trunk@4135 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r c1292aab6aa9 -r 0235cdb62c98 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Thu Mar 08 15:33:42 2012 +0000
+++ b/flys-client/ChangeLog	Thu Mar 08 15:39:29 2012 +0000
@@ -1,3 +1,15 @@
+2012-03-08  Raimund Renkert <raimund.renkert@intevation.de>
+
+	Issue 563.
+
+	* src/main/java/de/intevation/flys/client/client/ui/Toolbar.java:
+	  Set overflow to 'auto'.
+
+	* src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java,
+	  src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java:
+	  Added resize handler to increase or decrease the height if a scrollbar
+	  is visible.
+
 2012-03-08  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Issue 553.
diff -r c1292aab6aa9 -r 0235cdb62c98 flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java	Thu Mar 08 15:33:42 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java	Thu Mar 08 15:39:29 2012 +0000
@@ -3,6 +3,7 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.events.CloseClickHandler;
 import com.smartgwt.client.widgets.events.CloseClickEvent;
+import com.smartgwt.client.types.Overflow;
 
 import de.intevation.flys.client.shared.model.Artifact;
 import de.intevation.flys.client.shared.model.User;
@@ -17,6 +18,7 @@
 
     public Toolbar(OutputTab outputTab) {
         super();
+        setOverflow(Overflow.AUTO);
 
         this.outputTab = outputTab;
     }
diff -r c1292aab6aa9 -r 0235cdb62c98 flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java	Thu Mar 08 15:33:42 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java	Thu Mar 08 15:39:29 2012 +0000
@@ -8,6 +8,8 @@
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.events.ResizedEvent;
+import com.smartgwt.client.widgets.events.ResizedHandler;
 
 import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.ZoomEvent;
@@ -160,6 +162,16 @@
 
 
         initLayout();
+        addResizedHandler(new ResizedHandler() {
+            public void onResized(ResizedEvent e) {
+                if (getVisibleWidth() < 740) {
+                    setHeight(55);
+                }
+                else {
+                    setHeight(40);
+                }
+            }
+        });
     }
 
     /** Set width, height and other properties of an imagebutton. */
diff -r c1292aab6aa9 -r 0235cdb62c98 flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Thu Mar 08 15:33:42 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Thu Mar 08 15:39:29 2012 +0000
@@ -12,6 +12,8 @@
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.events.ResizedEvent;
+import com.smartgwt.client.widgets.events.ResizedHandler;
 
 import org.gwtopenmaps.openlayers.client.Map;
 import org.gwtopenmaps.openlayers.client.control.DragPan;
@@ -79,11 +81,10 @@
         super(mapTab);
 
         setWidth100();
-        setHeight(30);
+        setHeight(38);
         setMembersMargin(10);
         setPadding(5);
         setBorder("1px solid black");
-
         this.floodMap = floodMap;
 
         zoomToMaxButton = createMaxExtentControl();
@@ -125,6 +126,18 @@
 
         addMember(measureControl);
         addMember(createRightPanel());
+
+        addResizedHandler(new ResizedHandler() {
+            public void onResized(ResizedEvent e) {
+                if (getVisibleWidth() < 656) {
+                    setHeight(55);
+                }
+                else {
+                    setHeight(38);
+                }
+            }
+        });
+
     }