Fixes #2955: New item button clipped on new "poro" theme

svn changeset:7948/svn branch:6.0

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
index 014c0e0caea6bdbf4ebf64003c051bb1485f7fff..b473b7f7511c06913e260e4f7005105df7600093 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
@@ -153,14 +153,9 @@ abstract class VOptionGroupBase extends Composite implements Paintable, Field,
             if (newItemField == null) {\r
                 newItemButton = new VButton();\r
                 newItemButton.setText("+");\r
-                newItemButton.setWidth("1.5em");\r
                 newItemButton.addClickListener(this);\r
                 newItemField = new VTextField();\r
                 newItemField.addKeyboardListener(this);\r
-                // newItemField.setColumns(16);\r
-                if (getColumns() > 0) {\r
-                    newItemField.setWidth((getColumns() - 2) + "em");\r
-                }\r
             }\r
             newItemField.setEnabled(!disabled && !readonly);\r
             newItemButton.setEnabled(!disabled && !readonly);\r
@@ -168,6 +163,9 @@ abstract class VOptionGroupBase extends Composite implements Paintable, Field,
             if (newItemField == null || newItemField.getParent() != container) {\r
                 container.add(newItemField);\r
                 container.add(newItemButton);\r
+                final int w = container.getOffsetWidth()\r
+                        - newItemButton.getOffsetWidth();\r
+                newItemField.setWidth(Math.max(w, 0) + "px");\r
             }\r
         } else if (newItemField != null) {\r
             container.remove(newItemField);\r