diff options
author | Artur Signell <artur@vaadin.com> | 2012-11-29 20:31:02 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-12-10 11:39:15 +0200 |
commit | eb0a22d5ac67808a89e046f81b7032955d41be3c (patch) | |
tree | b358ae94569ef37bc29276decd0d4781c89fe9e5 /client | |
parent | c5cbf6243d4f2c7cd4c42f00fff94d7870670543 (diff) | |
download | vaadin-framework-eb0a22d5ac67808a89e046f81b7032955d41be3c.tar.gz vaadin-framework-eb0a22d5ac67808a89e046f81b7032955d41be3c.zip |
Additional fixes for accordion/IE (#9552)
Fixes Accordion for other themes than Reindeer aswell
Change-Id: If849e77adfb07e6a14784139c19e45b3b35a43b9
Diffstat (limited to 'client')
-rw-r--r-- | client/src/com/vaadin/client/ui/accordion/AccordionConnector.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java index 99e4ec0ffd..9bf4828584 100644 --- a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java +++ b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java @@ -21,6 +21,7 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.UIDL; +import com.vaadin.client.Util; import com.vaadin.client.ui.SimpleManagedLayout; import com.vaadin.client.ui.VAccordion; import com.vaadin.client.ui.VAccordion.StackItem; @@ -108,7 +109,7 @@ public class AccordionConnector extends TabsheetBaseConnector implements usedPixels += item.getCaptionHeight(); } else { // This includes the captionNode borders - usedPixels += item.getHeight(); + usedPixels += Util.getRequiredHeight(item.getElement()); } } int rootElementInnerHeight = getLayoutManager().getInnerHeight( |