Checkbox: handle Enter/Return/Space keys, change border color on focus

1 files changed, 5 insertions, 1 deletions

diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 1b475983..6e120f07 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -54,6 +54,10 @@ Item {
     width: checkBoxLayout.width
     opacity: enabled ? 1 : 0.7
 
+    Keys.onEnterPressed: toggle()
+    Keys.onReturnPressed: Keys.onEnterPressed(event)
+    Keys.onSpacePressed: Keys.onEnterPressed(event)
+
     function toggle(){
         if (checkBox.toggleOnClick) {
             checkBox.checked = !checkBox.checked
@@ -78,7 +82,7 @@ Item {
                 radius: 3
                 color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
                 border.color:
-                    if(checkBox.checked){
+                    if (checkBox.activeFocus) {
                         return MoneroComponents.Style.inputBorderColorActive;
                     } else {
                         return MoneroComponents.Style.inputBorderColorInActive;