Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java @ 1386:9aa1a453eed5
Issue 294.
Redesigned UESK tab layout, removed superfluous map wrapper canvas.
flys-client/trunk@3185 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Tue, 08 Nov 2011 13:07:56 +0000 |
| parents | 78542ff1f562 |
| children | b3264b5770b3 |
comparison
equal
deleted
inserted
replaced
| 1385:31e69ee9dd36 | 1386:9aa1a453eed5 |
|---|---|
| 117 VLayout rootLayout = new VLayout(); | 117 VLayout rootLayout = new VLayout(); |
| 118 rootLayout.setHeight100(); | 118 rootLayout.setHeight100(); |
| 119 rootLayout.setWidth100(); | 119 rootLayout.setWidth100(); |
| 120 rootLayout.setMembersMargin(2); | 120 rootLayout.setMembersMargin(2); |
| 121 | 121 |
| 122 final Canvas wrapper = new Canvas(); | 122 final HLayout hlayout = new HLayout(); |
| 123 wrapper.setWidth100(); | 123 hlayout.setHeight("*"); |
| 124 wrapper.setHeight100(); | 124 hlayout.setWidth100(); |
| 125 | 125 hlayout.setMembersMargin(2); |
| 126 controlPanel = createControlPanel(wrapper); | 126 |
| 127 final Canvas themePanelWrapper = createThemePanel(); | |
| 128 | |
| 129 controlPanel = createControlPanel(); | |
| 127 mapPanel = floodMap.getMapWidget(); | 130 mapPanel = floodMap.getMapWidget(); |
| 128 Canvas themePanelWrapper = createThemePanel(); | |
| 129 | |
| 130 final HorizontalPanel layout = new HorizontalPanel(); | 131 final HorizontalPanel layout = new HorizontalPanel(); |
| 131 layout.setWidth("99%"); | 132 layout.setWidth("99%"); |
| 132 layout.setHeight("99%"); | 133 layout.setHeight("99%"); |
| 133 layout.add(mapPanel); | 134 layout.add(mapPanel); |
| 134 | 135 |
| 135 wrapper.addChild(layout); | |
| 136 | |
| 137 HLayout hlayout = new HLayout(); | |
| 138 hlayout.setHeight("*"); | |
| 139 hlayout.setWidth100(); | |
| 140 hlayout.setMembersMargin(2); | |
| 141 | |
| 142 hlayout.addMember(themePanelWrapper); | 136 hlayout.addMember(themePanelWrapper); |
| 143 hlayout.addMember(wrapper); | 137 hlayout.addMember(layout); |
| 144 | 138 |
| 145 rootLayout.addMember(controlPanel); | 139 rootLayout.addMember(controlPanel); |
| 146 rootLayout.addMember(hlayout); | 140 rootLayout.addMember(hlayout); |
| 147 | 141 |
| 148 wrapper.addResizedHandler(new ResizedHandler() { | 142 hlayout.addResizedHandler(new ResizedHandler() { |
| 149 public void onResized(ResizedEvent e) { | 143 public void onResized(ResizedEvent e) { |
| 150 Integer height = wrapper.getHeight(); | 144 Integer height = hlayout.getHeight(); |
| 151 Integer width = wrapper.getWidth(); | 145 Integer width = hlayout.getWidth() - themePanelWrapper.getWidth(); |
| 152 | 146 |
| 153 height = height * 99 / 100; | 147 height = height * 99 / 100; |
| 154 width = width * 99 / 100; | 148 width = width * 99 / 100; |
| 155 | 149 |
| 156 String w = String.valueOf(width) + "px"; | 150 String w = String.valueOf(width) + "px"; |
| 376 | 370 |
| 377 return wms; | 371 return wms; |
| 378 } | 372 } |
| 379 | 373 |
| 380 | 374 |
| 381 protected MapToolbar createControlPanel(Canvas wrapper) { | 375 protected MapToolbar createControlPanel() { |
| 382 return new MapToolbar(this, floodMap, wrapper, false); | 376 return new MapToolbar(this, floodMap, false); |
| 383 } | 377 } |
| 384 | 378 |
| 385 | 379 |
| 386 protected Canvas createThemePanel() { | 380 protected Canvas createThemePanel() { |
| 387 Canvas c = new Canvas(); | 381 Canvas c = new Canvas(); |