summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorJohn Alhroos <john.ahlroos@itmill.com>2010-05-24 09:57:29 +0000
committerJohn Alhroos <john.ahlroos@itmill.com>2010-05-24 09:57:29 +0000
commit44f01a68fd4ffbacce5b8eb70eea1eb08aa98ccd (patch)
treebc2e6fe6b0fedf9f52587d1b6790502d379145c9 /src/com/vaadin
parent2623b9c01ca4e99929218f63a63bff7220322610 (diff)
downloadvaadin-framework-44f01a68fd4ffbacce5b8eb70eea1eb08aa98ccd.tar.gz
vaadin-framework-44f01a68fd4ffbacce5b8eb70eea1eb08aa98ccd.zip
Fixes with the issue with the DateField growing when toggling read-only state. Related to #4582 fix.
svn changeset:13316/svn branch:6.3
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 541b6e92d0..8d5c21c512 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -67,16 +67,17 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
calendarToggle.setTabIndex(uidl.getIntAttribute("tabindex"));
}
- if (lastReadOnlyState != readonly) {
- updateWidth();
- }
-
- calendarToggle.setEnabled(true);
if (readonly) {
calendarToggle.addStyleName(CLASSNAME + "-button-readonly");
} else {
calendarToggle.removeStyleName(CLASSNAME + "-button-readonly");
}
+
+ if (lastReadOnlyState != readonly) {
+ updateWidth();
+ }
+
+ calendarToggle.setEnabled(true);
}
@Override