summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authormichaelvogt <michael@vaadin.com>2013-04-03 14:12:42 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-03 11:39:17 +0000
commitad290f8c65057bdef33ec73cb49a8c6d10b9e356 (patch)
tree412d33a55ba9bf108802e6165514558f413e125c /client
parentd94f2cc6c3a1af73077ff902856da03c41a6e824 (diff)
downloadvaadin-framework-ad290f8c65057bdef33ec73cb49a8c6d10b9e356.tar.gz
vaadin-framework-ad290f8c65057bdef33ec73cb49a8c6d10b9e356.zip
Fix for CheckBox and Layout (#11407)
Change in CheckBoxConnector led to wrong enabled behaviour and addition to top coordinate to prevent scrollbars with VPopupCalendar Change-Id: I381ab7c8a605535280ae58716181ef4c346997f7
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
index ebfda2d715..7c2052e6f1 100644
--- a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
@@ -92,7 +92,9 @@ public class CheckBoxConnector extends AbstractFieldConnector implements
}
getWidget().setRequired(isRequired());
- getWidget().setEnabled(!isReadOnly());
+ if (isReadOnly()) {
+ getWidget().setEnabled(false);
+ }
if (getIcon() != null) {
if (getWidget().icon == null) {