Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear

Browse source 
Fix security image index clear after back nav
This commit is contained in:
Zach Fox 2018-01-24 13:43:49 -08:00 committed by GitHub
commit 6f54921cb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,6 +99,10 @@ Item {
function initModel() { function initModel() {
gridModel.initModel(); gridModel.initModel();
} }
function resetSelection() {
securityImageGrid.currentIndex = -1;
}
// //
// FUNCTION DEFINITIONS END // FUNCTION DEFINITIONS END
// //

2
interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
View file

@ -348,6 +348,7 @@ Item {
width: 200; width: 200;
text: "Back" text: "Back"
onClicked: { onClicked: {
securityImageSelection.resetSelection();
root.activeView = "step_1"; root.activeView = "step_1";
} }
} }
@ -516,6 +517,7 @@ Item {
width: 200; width: 200;
text: "Back" text: "Back"
onClicked: { onClicked: {
securityImageSelection.resetSelection();
root.lastPage = "step_3"; root.lastPage = "step_3";
root.activeView = "step_2"; root.activeView = "step_2";
} }