Bug 425843 - RAP: Changing a Checkbox by clicking on the label changes the UI but not the value in the model

https://bugs.eclipse.org/bugs/show_bug.cgi?id=425843

Change-Id: Ic4f7ac5238c373dd2cd91ddeebf4bfbb45211c3e
Signed-off-by: Matthias Nick <Matthias.Nick@bsiag.com>
Reviewed-on: https://git.eclipse.org/r/20694
Tested-by: Hudson CI
Reviewed-by: Claudio Guglielmo <claudio.guglielmo@bsiag.com>
IP-Clean: Claudio Guglielmo <claudio.guglielmo@bsiag.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/ext/MultilineCheckbox.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/ext/MultilineCheckbox.java
index b280e50559..d6889c0630 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/ext/MultilineCheckbox.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/ext/MultilineCheckbox.java
@@ -14,6 +14,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 
 /**
  * A CheckBox whose label supports multiline. See {@link MultilineButton} for more information
@@ -47,6 +49,13 @@ public class MultilineCheckbox extends MultilineButton {
     public void mouseUp(MouseEvent e) {
       if (leftMouseButtonClicked(e)) {
         m_btn.setSelection(!m_btn.getSelection());
+        m_btn.setFocus();
+        Event event = new Event();
+        event.widget = m_btn;
+        event.type = SWT.Selection;
+        for (Listener l : getListeners(SWT.Selection)) {
+          l.handleEvent(event);
+        }
       }
     }
 
diff --git a/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/ext/MultilineCheckbox.java b/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/ext/MultilineCheckbox.java
index 55427b7e39..272686268e 100644
--- a/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/ext/MultilineCheckbox.java
+++ b/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/ext/MultilineCheckbox.java
@@ -4,6 +4,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 
 /**
  * A CheckBox whose label supports multiline. See {@link MultilineButton} for more information
@@ -35,8 +37,15 @@ public class MultilineCheckbox extends MultilineButton {
     @Override
     public void mouseUp(MouseEvent e) {
       if (leftMouseButtonClicked(e)) {
-        m_btn.setFocus();
         m_btn.setSelection(!m_btn.getSelection());
+        m_btn.setFocus();
+        Event event = new Event();
+        event.widget = m_btn;
+        event.type = SWT.Selection;
+
+        for (Listener l : getListeners(SWT.Selection)) {
+          l.handleEvent(event);
+        }
       }
     }