]> source.dussan.org Git - vaadin-framework.git/commitdiff
Ensure the height of both captions are take into account (#8313)
authorLeif Åstrand <leif@vaadin.com>
Tue, 13 Mar 2012 10:32:48 +0000 (12:32 +0200)
committerLeif Åstrand <leif@vaadin.com>
Tue, 13 Mar 2012 10:32:48 +0000 (12:32 +0200)
src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java

index cb495293cc08c60f08a61482c9ffd4d6ff801f7d..5aafa2d1e09c5fa0cb825d5e221db0f79e7796d9 100644 (file)
@@ -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);