From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Fri, 22 May 2009 07:02:17 +0000 (+0000)
Subject: Fixes #2955: New item button clipped on new "poro" theme
X-Git-Tag: 6.7.0.beta1~2803
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d2f7355a079d0d2a79b36bf827b052db9a02eeea;p=vaadin-framework.git

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 014c0e0cae..b473b7f751 100644
--- 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) {
                 newItemButton = new VButton();
                 newItemButton.setText("+");
-                newItemButton.setWidth("1.5em");
                 newItemButton.addClickListener(this);
                 newItemField = new VTextField();
                 newItemField.addKeyboardListener(this);
-                // newItemField.setColumns(16);
-                if (getColumns() > 0) {
-                    newItemField.setWidth((getColumns() - 2) + "em");
-                }
             }
             newItemField.setEnabled(!disabled && !readonly);
             newItemButton.setEnabled(!disabled && !readonly);
@@ -168,6 +163,9 @@ abstract class VOptionGroupBase extends Composite implements Paintable, Field,
             if (newItemField == null || newItemField.getParent() != container) {
                 container.add(newItemField);
                 container.add(newItemButton);
+                final int w = container.getOffsetWidth()
+                        - newItemButton.getOffsetWidth();
+                newItemField.setWidth(Math.max(w, 0) + "px");
             }
         } else if (newItemField != null) {
             container.remove(newItemField);