Merge lp:~zsombi/ubuntu-ui-toolkit/switchAndCheckboxFix into lp:~bzoltan/ubuntu-ui-toolkit/OTA9-landing-2015-12-16

[Zsombor Egri]

Fix regression caused on CheckBox and Switch by revision 1760.

[Cris Dywan (kalikiana)]

For the record, since I at first wasn't convinced that the test is correct: clickedSpy.wait will make way for the compare(checkedNow and that can only pass if the trigger, which changes the checked value, was already emitted.
Nice!

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-14 15:49:19 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-17 13:03:03 +0000
@@ -81,6 +81,15 @@
     IS_SIGNAL_CONNECTED(q, UCAbstractButton, pressAndHold, ());
 }
 
+void UCAbstractButtonPrivate::onClicked()
+{
+    Q_Q(UCAbstractButton);
+    // call the overridden QML trigger function
+    invokeTrigger<UCAbstractButton>(q, QVariant());
+    // then emit the clicked signal
+    Q_EMIT q->clicked();
+}
+
 void UCAbstractButton::classBegin()
 {
     UCActionItem::classBegin();
@@ -137,9 +146,7 @@
     }
     // play haptics
     HapticsProxy::instance().play(QVariant());
-    Q_EMIT q->clicked();
-    // call the overridden QML trigger function
-    invokeTrigger<UCAbstractButton>(q, QVariant());
+    onClicked();
 }
 
 // handle pressAndHold
@@ -154,21 +161,18 @@
 }
 
 // emit clicked when Enter/Return is pressed
-void UCAbstractButton::keyPressEvent(QKeyEvent *event)
+void UCAbstractButton::keyReleaseEvent(QKeyEvent *event)
 {
-    UCActionItem::keyPressEvent(event);
+    UCActionItem::keyReleaseEvent(event);
 
     switch (event->key()) {
         case Qt::Key_Enter:
         case Qt::Key_Return:
         case Qt::Key_Space:
-        {
-            // trigger clicked signal first
-            Q_EMIT clicked();
-            // then invoke the overloaded trigger
-            invokeTrigger<UCAbstractButton>(this, QVariant());
-            break;
-        }
+            d_func()->onClicked();
+            break;
+        default:
+            break;
     }
 }
 

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-12-11 11:36:18 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-12-17 13:03:03 +0000
@@ -45,7 +45,7 @@
 
 protected:
     void classBegin();
-    void keyPressEvent(QKeyEvent *key);
+    void keyReleaseEvent(QKeyEvent *key);
 
 Q_SIGNALS:
     void pressedChanged();

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton_p.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton_p.h	2015-12-11 10:28:46 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton_p.h	2015-12-17 13:03:03 +0000
@@ -35,6 +35,7 @@
     void completeComponentInitialization() override;
 
     bool isPressAndHoldConnected();
+    void onClicked();
 
     // private slots
     void _q_mouseAreaPressed();

=== added file 'tests/unit_x11/tst_components/tst_toggles.qml'
--- tests/unit_x11/tst_components/tst_toggles.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_toggles.qml	2015-12-17 13:03:03 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+MainView {
+    id: main
+
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        Switch {
+            id: testSwitch
+            checked: true
+            property bool checkedNow: true
+            onClicked: checkedNow = checked
+        }
+
+        CheckBox {
+            id: testCheck
+            checked: true
+            property bool checkedNow: true
+            onClicked: checkedNow = checked
+        }
+    }
+
+    UbuntuTestCase {
+        name: "Toggles13"
+        when: windowShown
+
+        SignalSpy {
+            id: clickedSpy
+            signalName: "clicked"
+        }
+
+        function cleanup() {
+            clickedSpy.clear();
+            clickedSpy.target = null;
+        }
+
+        function test_toggle_checked_delayed_bug1524234_data() {
+            return [
+                {tag: "CheckBox", testItem: testCheck, mouse: true},
+                {tag: "Switch", testItem: testSwitch, mouse: true},
+                {tag: "CheckBox, space key", testItem: testCheck, key: Qt.Key_Space},
+                {tag: "Switch, space key", testItem: testSwitch, key: Qt.Key_Space},
+            ];
+        }
+        function test_toggle_checked_delayed_bug1524234(data) {
+            data.testItem.checkedNow = data.testItem.checked;
+            data.testItem.forceActiveFocus();
+            clickedSpy.target = data.testItem;
+            if (data.key) {
+                keyClick(data.key);
+            } else {
+                mouseClick(data.testItem, centerOf(data.testItem).x, centerOf(data.testItem).y);
+            }
+            clickedSpy.wait(400);
+            compare(data.testItem.checkedNow, data.testItem.checked);
+        }
+    }
+}
+