diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-04-03 13:56:07 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-04-03 14:41:41 +0300 |
| commit | 6bf22c0d4359034e2f934038382895f177f6a458 (patch) | |
| tree | 89e83d4842424bd32ea1c5691628e5a2ff41ae3a | |
| parent | 307ad43d571f4f5c9b8792632efb728c4460f4be (diff) | |
| download | vaadin-framework-6bf22c0d4359034e2f934038382895f177f6a458.tar.gz vaadin-framework-6bf22c0d4359034e2f934038382895f177f6a458.zip | |
Do panel wrapper sizing with css
| -rw-r--r-- | WebContent/VAADIN/themes/base/panel/panel.css | 6 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css index 5ef0d91e49..286b1b7f4d 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.css +++ b/WebContent/VAADIN/themes/base/panel/panel.css @@ -33,5 +33,11 @@ box-sizing: border-box; -moz-box-sizing: border-box; } +.v-panel.v-has-width > .v-panel-content { + width: 100%; +} +.v-panel.v-has-height > .v-panel-content { + height: 100%; +} .v-panel-deco { }
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java index e39781952a..03a76839e7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java @@ -202,19 +202,6 @@ public class PanelConnector extends AbstractComponentContainerConnector void updateSizes() { VPanel panel = getWidget(); - Style contentStyle = panel.contentNode.getStyle(); - if (isUndefinedHeight()) { - contentStyle.clearHeight(); - } else { - contentStyle.setHeight(100, Unit.PCT); - } - - if (isUndefinedWidth()) { - contentStyle.clearWidth(); - } else { - contentStyle.setWidth(100, Unit.PCT); - } - LayoutManager layoutManager = getLayoutManager(); int top = layoutManager.getInnerHeight(panel.captionNode); int bottom = layoutManager.getInnerHeight(panel.bottomDecoration); |