#4036 VPopupCalendar button was clipped

svn changeset:11011/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 8d83e8b2b54745afea345b9d3c3691c8ef1dcaad..9b504bc5f3f96348852c0c7615b8179d283c4cd6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -52,7 +52,6 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {\r
         boolean lastReadOnlyState = readonly;\r
         super.updateFromUIDL(uidl, client);\r
-        addStyleName(CLASSNAME + "-popupcalendar");\r
         popup.setStyleName(VDateField.CLASSNAME + "-popup "\r
                 + VDateField.CLASSNAME + "-"\r
                 + resolutionToString(currentResolution));\r
@@ -67,6 +66,12 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
 \r
     }\r
 \r
+    @Override\r
+    public void setStyleName(String style) {\r
+        // make sure the style is there before size calculation\r
+        super.setStyleName(style + " " + CLASSNAME + "-popupcalendar");\r
+    }\r
+\r
     public void onClick(ClickEvent event) {\r
         if (event.getSource() == calendarToggle && !open && !readonly) {\r
             open = true;\r