From 01a0b26b90e4146857797f49f173ab9b2f7bc9b8 Mon Sep 17 00:00:00 2001 From: vladest Date: Fri, 29 Sep 2017 17:14:35 +0200 Subject: [PATCH 1/4] Remove mouse area for text fields. use activeFocusOnPress property instead --- .../commerce/wallet/PassphraseSelection.qml | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index e7ff8489d1..653f81501c 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -76,6 +76,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: "enter current passphrase"; + activeFocusOnPress: true + activeFocusOnTab: true onFocusChanged: { if (focus) { @@ -85,14 +87,6 @@ Item { } } - MouseArea { - anchors.fill: parent; - onClicked: { - parent.focus = true; - sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); - } - } - onAccepted: { passphraseField.focus = true; } @@ -109,6 +103,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: root.isShowingTip ? "" : "enter new passphrase"; + activeFocusOnPress: true + activeFocusOnTab: true onFocusChanged: { if (focus) { @@ -118,14 +114,6 @@ Item { } } - MouseArea { - anchors.fill: parent; - onClicked: { - parent.focus = true; - sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'}); - } - } - onAccepted: { passphraseFieldAgain.focus = true; } @@ -140,6 +128,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: root.isShowingTip ? "" : "re-enter new passphrase"; + activeFocusOnPress: true + activeFocusOnTab: true onFocusChanged: { if (focus) { @@ -149,14 +139,6 @@ Item { } } - MouseArea { - anchors.fill: parent; - onClicked: { - parent.focus = true; - sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'}); - } - } - onAccepted: { focus = false; } From 7f6773b1f48925c84a940311cb204fcd41687dcd Mon Sep 17 00:00:00 2001 From: vladest Date: Fri, 29 Sep 2017 21:12:21 +0200 Subject: [PATCH 2/4] Added semicolons --- .../qml/hifi/commerce/wallet/PassphraseSelection.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index 653f81501c..93341d74cd 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -76,8 +76,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: "enter current passphrase"; - activeFocusOnPress: true - activeFocusOnTab: true + activeFocusOnPress: true; + activeFocusOnTab: true; onFocusChanged: { if (focus) { @@ -103,8 +103,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: root.isShowingTip ? "" : "enter new passphrase"; - activeFocusOnPress: true - activeFocusOnTab: true + activeFocusOnPress: true; + activeFocusOnTab: true; onFocusChanged: { if (focus) { @@ -128,8 +128,8 @@ Item { height: 50; echoMode: TextInput.Password; placeholderText: root.isShowingTip ? "" : "re-enter new passphrase"; - activeFocusOnPress: true - activeFocusOnTab: true + activeFocusOnPress: true; + activeFocusOnTab: true; onFocusChanged: { if (focus) { From feafd441b1ddf3be3b930ab5f9f85e9e6ebdcb36 Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 1 Oct 2017 18:54:07 +0200 Subject: [PATCH 3/4] Make sure keyboard will be rised after lowering on another click --- .../commerce/wallet/PassphraseSelection.qml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index 93341d74cd..af05f16f15 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -87,6 +87,14 @@ Item { } } + MouseArea { + anchors.fill: parent + onPressed: { + sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); + mouse.accepted = false + } + } + onAccepted: { passphraseField.focus = true; } @@ -106,6 +114,14 @@ Item { activeFocusOnPress: true; activeFocusOnTab: true; + MouseArea { + anchors.fill: parent + onPressed: { + sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); + mouse.accepted = false + } + } + onFocusChanged: { if (focus) { sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'}); @@ -118,6 +134,7 @@ Item { passphraseFieldAgain.focus = true; } } + HifiControlsUit.TextField { id: passphraseFieldAgain; colorScheme: hifi.colorSchemes.dark; @@ -131,6 +148,14 @@ Item { activeFocusOnPress: true; activeFocusOnTab: true; + MouseArea { + anchors.fill: parent + onPressed: { + sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); + mouse.accepted = false + } + } + onFocusChanged: { if (focus) { sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'}); From 9a00468ea9414e635fa99c072faab2e80720cb53 Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 1 Oct 2017 19:21:30 +0200 Subject: [PATCH 4/4] semicolons, yes --- .../qml/hifi/commerce/wallet/PassphraseSelection.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index af05f16f15..f0338bf1f1 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -88,10 +88,10 @@ Item { } MouseArea { - anchors.fill: parent + anchors.fill: parent; onPressed: { sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); - mouse.accepted = false + mouse.accepted = false; } } @@ -115,10 +115,10 @@ Item { activeFocusOnTab: true; MouseArea { - anchors.fill: parent + anchors.fill: parent; onPressed: { sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); - mouse.accepted = false + mouse.accepted = false; } } @@ -149,10 +149,10 @@ Item { activeFocusOnTab: true; MouseArea { - anchors.fill: parent + anchors.fill: parent; onPressed: { sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); - mouse.accepted = false + mouse.accepted = false; } }