4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 20:02:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merchant: fix leaving the page

Browse Source
This commit is contained in:
xiphon 2019-11-01 01:52:15 +00:00
parent cdad85c0ef
commit 5df14abed2
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.qml
View File

@ -1569,14 +1569,12 @@ ApplicationWindow {
states: [ states: [
State { State {
name: "wizard" name: "wizard"
PropertyChanges { target: leftPanel; visible: false }
PropertyChanges { target: middlePanel; visible: false } PropertyChanges { target: middlePanel; visible: false }
PropertyChanges { target: wizard; visible: true } PropertyChanges { target: wizard; visible: true }
PropertyChanges { target: resizeArea; visible: true } PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: titleBar; state: "essentials" } PropertyChanges { target: titleBar; state: "essentials" }
}, State { }, State {
name: "normal" name: "normal"
PropertyChanges { target: leftPanel; visible: true }
PropertyChanges { target: middlePanel; visible: true } PropertyChanges { target: middlePanel; visible: true }
PropertyChanges { target: wizard; visible: false } PropertyChanges { target: wizard; visible: false }
PropertyChanges { target: resizeArea; visible: true } PropertyChanges { target: resizeArea; visible: true }
@ -1589,6 +1587,7 @@ ApplicationWindow {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
visible: rootItem.state == "normal" && middlePanel.state != "Merchant"
onTransferClicked: { onTransferClicked: {
middlePanel.state = "Transfer"; middlePanel.state = "Transfer";

4
pages/merchant/Merchant.qml
View File

@ -33,8 +33,6 @@ Item {
property var hiddenAmounts: [] property var hiddenAmounts: []
function onPageCompleted() { function onPageCompleted() {
appWindow.hideMenu();
// prepare tracking // prepare tracking
trackingCheckbox.checked = root.enableTracking trackingCheckbox.checked = root.enableTracking
root.update(); root.update();
@ -56,8 +54,6 @@ Item {
timer.running = false timer.running = false
root.enableTracking = false root.enableTracking = false
trackingModel.clear() trackingModel.clear()
appWindow.showMenu();
} }
Image { Image {