diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-02-14 16:26:22 +0200 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-02-14 16:26:22 +0200 |
commit | 775dafb0bee2981b9ea1f9a2e9fd531c0687cdda (patch) | |
tree | 715d72463290102d85e329a2efcea99dfd45e1de | |
parent | 292bba8cba1ac75a3d569c8d32d3507c9faef4f8 (diff) | |
download | vaadin-framework-775dafb0bee2981b9ea1f9a2e9fd531c0687cdda.tar.gz vaadin-framework-775dafb0bee2981b9ea1f9a2e9fd531c0687cdda.zip |
Properly update height and width of tab content (#8313)
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java index c035855695..61fd389200 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java @@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; -import com.vaadin.terminal.gwt.client.RenderSpace; import com.vaadin.terminal.gwt.client.TooltipInfo; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; @@ -865,10 +864,8 @@ public class VTabsheet extends VTabsheetBase { // Set proper values for content element DOM.setStyleAttribute(contentNode, "height", contentHeight + "px"); - renderSpace.setHeight(contentHeight); } else { DOM.setStyleAttribute(contentNode, "height", ""); - renderSpace.setHeight(0); } } @@ -892,10 +889,10 @@ public class VTabsheet extends VTabsheetBase { int minWidth = 0; if (!isDynamicHeight()) { - height = renderSpace.getHeight(); + height = contentNode.getOffsetHeight(); } if (!isDynamicWidth()) { - width = renderSpace.getWidth(); + width = contentNode.getOffsetWidth(); } else { /* * If the tabbar is wider than the content we need to use the tabbar @@ -1005,8 +1002,6 @@ public class VTabsheet extends VTabsheetBase { return borderW; } - private final RenderSpace renderSpace = new RenderSpace(0, 0, true); - @Override protected int getTabCount() { return tb.getTabCount(); |