From 6bf22c0d4359034e2f934038382895f177f6a458 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Tue, 3 Apr 2012 13:56:07 +0300 Subject: [PATCH] Do panel wrapper sizing with css --- WebContent/VAADIN/themes/base/panel/panel.css | 6 ++++++ .../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); -- 2.39.5