Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:23:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout

Browse source
This commit is contained in:
Zach Fox 2017-10-05 14:34:53 -07:00
parent 9290a51685
commit 0b600a74c3
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -892,6 +892,10 @@ Rectangle {
} else { } else {
root.activeView = "checkoutSuccess"; root.activeView = "checkoutSuccess";
} }
root.balanceReceived = false;
root.purchasesReceived = false;
commerce.inventory();
commerce.balance();
} }
// //

2
interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
View file

@ -39,7 +39,7 @@ Item {
sendToParent({method: "needsLogIn"}); sendToParent({method: "needsLogIn"});
} else if (walletStatus === 3) { } else if (walletStatus === 3) {
commerce.getSecurityImage(); commerce.getSecurityImage();
} else { } else if (walletStatus > 3) {
console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus); console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus);
} }
} }

4
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -197,6 +197,8 @@ Item {
height: 50; height: 50;
echoMode: TextInput.Password; echoMode: TextInput.Password;
placeholderText: "passphrase"; placeholderText: "passphrase";
activeFocusOnPress: true;
activeFocusOnTab: true;
onFocusChanged: { onFocusChanged: {
root.keyboardRaised = focus; root.keyboardRaised = focus;
@ -206,8 +208,8 @@ Item {
anchors.fill: parent; anchors.fill: parent;
onClicked: { onClicked: {
parent.focus = true;
root.keyboardRaised = true; root.keyboardRaised = true;
mouse.accepted = false;
} }
} }