From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 13 Mar 2012 10:32:48 +0000 (+0200)
Subject: Ensure the height of both captions are take into account (#8313)
X-Git-Tag: 7.0.0.alpha2~361
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b9b4ee8e5c9518cea4504d9f90c6b32a4875135;p=vaadin-framework.git

Ensure the height of both captions are take into account (#8313)
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
index cb495293cc..5aafa2d1e0 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
@@ -337,14 +337,9 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
     }
 
     void setInternalHeights() {
-        int captionHeight = 0;
+        int captionHeight = Util.getRequiredHeight(captionWrapper);
         int totalHeight = getOffsetHeight();
 
-        if (optionsCaption != null) {
-            captionHeight = Util.getRequiredHeight(optionsCaption);
-        } else if (selectionsCaption != null) {
-            captionHeight = Util.getRequiredHeight(selectionsCaption);
-        }
         String selectHeight = (totalHeight - captionHeight) + "px";
 
         selections.setHeight(selectHeight);