Mercurial > dive4elements > river
changeset 4016:87aafd2c643a
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2012 10:47:44 +0200 |
| parents | 7f8d92873d58 (current diff) 0be65bc65cee (diff) |
| children | e1691b74f3aa |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Oct 02 10:42:34 2012 +0200 +++ b/flys-client/ChangeLog Tue Oct 02 10:47:44 2012 +0200 @@ -1,6 +1,14 @@ +2012-10-01 Christian Lins <christian.lins@intevation.de> + + * flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java, + flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java, + flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java: + Setting Toolbar Overflow behaviour to HIDDEN to avoid nasty scrollbars + using the Internet Explorer (#761). + 2012-10-01 Björn Ricks <bjoern.ricks@intevation.de> - * src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java + * src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java: Add missing import of FLYSConstants 2012-10-01 Björn Ricks <bjoern.ricks@intevation.de>
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java Tue Oct 02 10:42:34 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java Tue Oct 02 10:47:44 2012 +0200 @@ -1,15 +1,14 @@ package de.intevation.flys.client.client.ui; -import com.smartgwt.client.widgets.layout.HLayout; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.widgets.events.CloseClickEvent; import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.events.CloseClickEvent; -import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.widgets.layout.HLayout; +import de.intevation.flys.client.client.event.RedrawRequestHandler; import de.intevation.flys.client.shared.model.Artifact; import de.intevation.flys.client.shared.model.User; -import de.intevation.flys.client.client.event.RedrawRequestHandler; - public abstract class Toolbar extends HLayout { @@ -18,7 +17,9 @@ public Toolbar(OutputTab outputTab) { super(); - setOverflow(Overflow.AUTO); + + // Set overflow to hidden in order to prevent nasty scrollbars in IE + setOverflow(Overflow.HIDDEN); this.outputTab = outputTab; } @@ -49,6 +50,7 @@ artifact, user, outs, outputTab.getCollectionView()); dc.addRedrawRequestHandler(handler); dc.addCloseClickHandler(new CloseClickHandler() { + @Override public void onCloseClick(CloseClickEvent event) { dc.destroy(); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Tue Oct 02 10:42:34 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Tue Oct 02 10:47:44 2012 +0200 @@ -1,7 +1,7 @@ package de.intevation.flys.client.client.ui.chart; import com.google.gwt.core.client.GWT; -import com.smartgwt.client.types.Overflow; + import com.smartgwt.client.widgets.Button; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.ImgButton; @@ -274,8 +274,6 @@ addMember(spacer); addMember(position); - - setOverflow(Overflow.HIDDEN); } /**
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Tue Oct 02 10:42:34 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Tue Oct 02 10:47:44 2012 +0200 @@ -1,6 +1,7 @@ package de.intevation.flys.client.client.ui.map; import com.google.gwt.core.client.GWT; + import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.SelectionType; import com.smartgwt.client.util.SC; @@ -10,8 +11,6 @@ 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 com.smartgwt.client.widgets.layout.HLayout; import de.intevation.flys.client.client.FLYSConstants; @@ -138,19 +137,6 @@ addMember(measureControl); addMember(createRightPanel()); - - addResizedHandler(new ResizedHandler() { - @Override - public void onResized(ResizedEvent e) { - if (getVisibleWidth() < 656) { - setHeight(55); - } - else { - setHeight(38); - } - } - }); - }