QQuickSwitch: fix the order of checkedChanged() vs. clicked()

And emit clicked() also when the switch was dragged to make it possible
to use clicked() reliably to detect user interaction.

Change-Id: Iefbd95b90ed40f04d84e03e247a8ac12c7f0e9ca
Task-number: QTBUG-52558
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index e6f8cce0..380c37ec 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -142,14 +142,17 @@ bool QQuickSwitchPrivate::handleMouseReleaseEvent(QQuickItem *child, QMouseEvent
     pressPoint = QPoint();
     q->setPressed(false);
     if (child->keepMouseGrab()) {
+        bool wasChecked = checked;
         q->setChecked(position > 0.5);
         q->setPosition(checked ? 1.0 : 0.0);
         child->setKeepMouseGrab(false);
+        if (wasChecked != checked)
+            emit q->clicked();
         event->accept();
     } else {
+        q->toggle();
         emit q->clicked();
         event->accept();
-        q->toggle();
     }
     return true;
 }