Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 22:50:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11490 from vladest/fix_walletsetup_focus

Browse source 
Remove mouse area for text fields. use activeFocusOnPress property in…
This commit is contained in:
Zach Fox 2017-10-02 08:38:04 -07:00 committed by GitHub
commit 2783293d24
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
View file

@ -76,6 +76,8 @@ Item {
height: 50; height: 50;
echoMode: TextInput.Password; echoMode: TextInput.Password;
placeholderText: "enter current passphrase"; placeholderText: "enter current passphrase";
activeFocusOnPress: true;
activeFocusOnTab: true;
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
@ -87,9 +89,9 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
onClicked: { onPressed: {
parent.focus = true;
sendSignalToWallet({method: 'walletSetup_raiseKeyboard'}); sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
mouse.accepted = false;
} }
} }
@ -109,6 +111,16 @@ Item {
height: 50; height: 50;
echoMode: TextInput.Password; echoMode: TextInput.Password;
placeholderText: root.isShowingTip ? "" : "enter new passphrase"; placeholderText: root.isShowingTip ? "" : "enter new passphrase";
activeFocusOnPress: true;
activeFocusOnTab: true;
MouseArea {
anchors.fill: parent;
onPressed: {
sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
mouse.accepted = false;
}
}
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
@ -118,18 +130,11 @@ Item {
} }
} }
MouseArea {
anchors.fill: parent;
onClicked: {
parent.focus = true;
sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'});
}
}
onAccepted: { onAccepted: {
passphraseFieldAgain.focus = true; passphraseFieldAgain.focus = true;
} }
} }
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: passphraseFieldAgain; id: passphraseFieldAgain;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
@ -140,6 +145,16 @@ Item {
height: 50; height: 50;
echoMode: TextInput.Password; echoMode: TextInput.Password;
placeholderText: root.isShowingTip ? "" : "re-enter new passphrase"; placeholderText: root.isShowingTip ? "" : "re-enter new passphrase";
activeFocusOnPress: true;
activeFocusOnTab: true;
MouseArea {
anchors.fill: parent;
onPressed: {
sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
mouse.accepted = false;
}
}
onFocusChanged: { onFocusChanged: {
if (focus) { if (focus) {
@ -149,14 +164,6 @@ Item {
} }
} }
MouseArea {
anchors.fill: parent;
onClicked: {
parent.focus = true;
sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'});
}
}
onAccepted: { onAccepted: {
focus = false; focus = false;
} }