Fix: Button does not toggle on keypress

This ensures that you can toggle a button using the space bar.

task-number: QTBUG-33540
Change-Id: I7f665623fe113be11ba7e3f2c605e255d45e31a9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

2 files changed, 22 insertions, 2 deletions

diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index 188e35ff..4c1eeb04 100644
--- a/src/controls/Private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
@@ -166,10 +166,13 @@ Control {
             behavior.keyPressed = true;
     }
 
+    onFocusChanged: if (!focus) behavior.keyPressed = false
+
     Keys.onReleased: {
         if (event.key === Qt.Key_Space && !event.isAutoRepeat && behavior.keyPressed) {
             behavior.keyPressed = false;
             __action.trigger(button)
+            behavior.toggle()
         }
     }
 
@@ -182,10 +185,14 @@ Control {
         hoverEnabled: true
         enabled: !keyPressed
 
+        function toggle() {
+            if (button.checkable && !button.action && !(button.checked && button.exclusiveGroup))
+                button.checked = !button.checked
+        }
+
         onReleased: {
             if (containsMouse) {
-                if (button.checkable && !button.action && !(button.checked && button.exclusiveGroup))
-                    button.checked = !button.checked
+                toggle()
                 __action.trigger(button)
             }
         }
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 5aba4376..ee555ac0 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -263,6 +263,19 @@ TestCase {
         verify(!button.checked)
         compare(checkSpy.count, checkCount)
 
+        // keyboard toggle
+        button.forceActiveFocus()
+        keyClick(Qt.Key_Space)
+        verify(button.checked)
+        compare(checkSpy.count, ++checkCount)
+
+        // toggle on release
+        keyPress(Qt.Key_Space)
+        verify(button.checked)
+        keyRelease(Qt.Key_Space)
+        verify(!button.checked)
+        compare(checkSpy.count, ++checkCount)
+
         button.destroy()
     }
 }