Fix for #2176 - TwinColSelect width problem

svn changeset:5745/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
index b6a95ffb73bc32274a59e758a41b2f0bbbbbb87f..1a2b708f7c4d643bb810d299a0475d486a65b88a 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
@@ -86,19 +86,26 @@ public class ITwinColSelect extends IOptionGroupBase {
                         optionUidl.getStringAttribute("key"));\r
             }\r
         }\r
+\r
+        int cols = -1;\r
         if (getColumns() > 0) {\r
-            options.setWidth(getColumns() + "em");\r
-            selections.setWidth(getColumns() + "em");\r
-            optionsContainer.setWidth((getColumns() * 2 + 3) + "em");\r
+            cols = getColumns();\r
         } else if (!widthSet) {\r
-            options.setWidth(DEFAULT_COLUMN_COUNT + "em");\r
-            selections.setWidth(DEFAULT_COLUMN_COUNT + "em");\r
-            optionsContainer.setWidth((DEFAULT_COLUMN_COUNT * 2 + 2) + "em");\r
+            cols = DEFAULT_COLUMN_COUNT;\r
+        }\r
+\r
+        if (cols >= 0) {\r
+            options.setWidth(cols + "em");\r
+            selections.setWidth(cols + "em");\r
+            buttons.setWidth("3.5em");\r
+            optionsContainer.setWidth((2 * cols + 4) + "em");\r
         }\r
         if (getRows() > 0) {\r
             options.setVisibleItemCount(getRows());\r
             selections.setVisibleItemCount(getRows());\r
+\r
         }\r
+\r
     }\r
 \r
     protected Object[] getSelectedItems() {\r