aboutsummaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2020-12-02 23:55:42 +0000
committerxiphon <xiphon@protonmail.com>2020-12-03 19:40:15 +0000
commit0d5d2dbf5ea5cc575b1e38854e935a8f1794146b (patch)
treee8de25d2a9e3f4e2c675cb8f1ccb2728872e0577 /components
parent96f9c11320ee3c4f1f1c35f3ac8e8f78340bd378 (diff)
downloadmonzero-gui-0d5d2dbf5ea5cc575b1e38854e935a8f1794146b.tar.gz
monzero-gui-0d5d2dbf5ea5cc575b1e38854e935a8f1794146b.tar.xz
monzero-gui-0d5d2dbf5ea5cc575b1e38854e935a8f1794146b.zip
Transfer: fix focus, cycle focus between Address, Amount and Send
Diffstat (limited to 'components')
-rw-r--r--components/LineEdit.qml2
-rw-r--r--components/LineEditMulti.qml6
-rw-r--r--components/StandardButton.qml4
3 files changed, 9 insertions, 3 deletions
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index 118067f4..aad42895 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -94,6 +94,7 @@ Item {
height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
+ onActiveFocusChanged: activeFocus && input.forceActiveFocus()
onTextUpdated: {
// check to remove placeholder text when there is content
if(item.isEmpty()){
@@ -234,6 +235,7 @@ Item {
anchors.leftMargin: inlineIcon.visible ? 44 : 0
font.pixelSize: item.fontSize
font.bold: item.fontBold
+ KeyNavigation.tab: item.KeyNavigation.tab
onEditingFinished: item.editingFinished()
onAccepted: item.accepted();
onTextChanged: item.textUpdated()
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index 179d0438..4e971285 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -94,6 +94,8 @@ ColumnLayout {
signal inputLabelLinkActivated();
signal editingFinished();
+ onActiveFocusChanged: activeFocus && input.forceActiveFocus()
+
spacing: 0
Rectangle {
id: inputLabelRect
@@ -159,8 +161,10 @@ ColumnLayout {
id: input
readOnly: false
addressValidation: false
+ KeyNavigation.priority: KeyNavigation.BeforeItem
+ KeyNavigation.tab: item.KeyNavigation.tab
Layout.fillWidth: true
-
+
leftPadding: item.inputPaddingLeft
rightPadding: item.inputPaddingRight
topPadding: item.inputPaddingTop
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index c69adb29..d26d9aa8 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -68,7 +68,7 @@ Item {
id: buttonRect
anchors.fill: parent
radius: 3
- border.width: parent.focus ? 1 : 0
+ border.width: parent.focus && parent.enabled ? 1 : 0
state: button.enabled ? "active" : "disabled"
Component.onCompleted: state = state
@@ -76,7 +76,7 @@ Item {
states: [
State {
name: "hover"
- when: buttonArea.containsMouse || button.focus
+ when: button.enabled && (buttonArea.containsMouse || button.focus)
PropertyChanges {
target: buttonRect
color: primary