monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-02 03:06:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2423

Browse source 
5df14ab Merchant: fix leaving the page (xiphon)
This commit is contained in:
luigi1111 2019-11-03 19:11:29 -06:00
commit 33babc5d85
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
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: [
State {
name: "wizard"
PropertyChanges { target: leftPanel; visible: false }
PropertyChanges { target: middlePanel; visible: false }
PropertyChanges { target: wizard; visible: true }
PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: titleBar; state: "essentials" }
}, State {
name: "normal"
PropertyChanges { target: leftPanel; visible: true }
PropertyChanges { target: middlePanel; visible: true }
PropertyChanges { target: wizard; visible: false }
PropertyChanges { target: resizeArea; visible: true }
@ -1589,6 +1587,7 @@ ApplicationWindow {
anchors.top: parent.top
anchors.left: parent.left
anchors.bottom: parent.bottom
visible: rootItem.state == "normal" && middlePanel.state != "Merchant"
onTransferClicked: {
middlePanel.state = "Transfer";

4
pages/merchant/Merchant.qml
View file

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