From 0fd0d8ce5f91c037e12e4d61f05d66437eb4088b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 21 Jul 2017 05:33:24 +0200 Subject: Return pressed & activeFocus --- framework/qml/Button.qml | 2 ++ framework/qml/PositiveButton.qml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/framework/qml/Button.qml b/framework/qml/Button.qml index 7473c140..83f02cff 100644 --- a/framework/qml/Button.qml +++ b/framework/qml/Button.qml @@ -32,6 +32,7 @@ T.Button { clip: true hoverEnabled: true + Keys.onReturnPressed: root.clicked() background: Rectangle { color: Colors.buttonColor @@ -49,6 +50,7 @@ T.Button { contentItem: Label { text: root.text + font.underline: root.activeFocus elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml index aa134d15..4293d082 100644 --- a/framework/qml/PositiveButton.qml +++ b/framework/qml/PositiveButton.qml @@ -32,12 +32,13 @@ T.Button { clip: true hoverEnabled: true + Keys.onReturnPressed: root.clicked() background: Rectangle { color: Colors.positiveColor border.width: 2 - border.color: root.focus && !root.pressed ? Colors.highlightColor : Colors.positiveColor + border.color: root.activeFocus && !root.pressed ? Colors.highlightColor : Colors.positiveColor Rectangle { anchors.fill: parent @@ -49,7 +50,7 @@ T.Button { contentItem: Label { text: root.text - font.underline: root.focus + font.underline: root.activeFocus elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter -- cgit v1.2.3