From 3b76636d6b172f3afe6224c5ccb05e8307df4c13 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Thu, 5 Apr 2018 10:32:43 +0200 Subject: [PATCH 1/2] Refactoring signal functions --- main.qml | 90 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 10 deletions(-) diff --git a/main.qml b/main.qml index b481985c..7b8ba21b 100644 --- a/main.qml +++ b/main.qml @@ -1315,16 +1315,86 @@ ApplicationWindow { anchors.top: mobileHeader.bottom anchors.left: parent.left anchors.bottom: parent.bottom - onDashboardClicked: { middlePanel.state = "Dashboard"; if(isMobile) hideMenu(); updateBalance(); } - onTransferClicked: { middlePanel.state = "Transfer"; if(isMobile) hideMenu(); updateBalance(); } - onReceiveClicked: { middlePanel.state = "Receive"; if(isMobile) hideMenu(); updateBalance(); } - onTxkeyClicked: { middlePanel.state = "TxKey"; if(isMobile) hideMenu(); updateBalance(); } - onSharedringdbClicked: { middlePanel.state = "SharedRingDB"; if(isMobile) hideMenu(); updateBalance(); } - onHistoryClicked: { middlePanel.state = "History"; if(isMobile) hideMenu(); updateBalance(); } - onAddressBookClicked: { middlePanel.state = "AddressBook"; if(isMobile) hideMenu(); updateBalance(); } - onMiningClicked: { middlePanel.state = "Mining"; if(isMobile) hideMenu(); updateBalance(); } - onSignClicked: { middlePanel.state = "Sign"; if(isMobile) hideMenu(); updateBalance(); } - onSettingsClicked: { middlePanel.state = "Settings"; if(isMobile) hideMenu(); updateBalance(); } + onDashboardClicked: { + middlePanel.state = "Dashboard"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onTransferClicked: { + middlePanel.state = "Transfer"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onReceiveClicked: { + middlePanel.state = "Receive"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onTxkeyClicked: { + middlePanel.state = "TxKey"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onSharedringdbClicked: { + middlePanel.state = "SharedRingDB"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onHistoryClicked: { + middlePanel.state = "History"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onAddressBookClicked: { + middlePanel.state = "AddressBook"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onMiningClicked: { + middlePanel.state = "Mining"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onSignClicked: { + middlePanel.state = "Sign"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + + onSettingsClicked: { + middlePanel.state = "Settings"; + if(isMobile) { + hideMenu(); + } + updateBalance(); + } + onKeysClicked: { passwordDialog.onAcceptedCallback = function() { if(walletPassword === passwordDialog.password){ From 1378ae45c3007e3ac26463053b96b41398846215 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Thu, 5 Apr 2018 11:52:09 +0200 Subject: [PATCH 2/2] Reset flickable scrollview to 0 Y position --- MiddlePanel.qml | 1 + main.qml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/MiddlePanel.qml b/MiddlePanel.qml index bda38433..3cc2163f 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -50,6 +50,7 @@ Rectangle { property string unlockedBalanceText property int minHeight: (appWindow.height > 800) ? appWindow.height : 800 * scaleRatio property alias contentHeight: mainFlickable.contentHeight + property alias flickable: mainFlickable // property int headerHeight: header.height property Transfer transferView: Transfer { } diff --git a/main.qml b/main.qml index 7b8ba21b..d9fda79a 100644 --- a/main.qml +++ b/main.qml @@ -1317,6 +1317,7 @@ ApplicationWindow { anchors.bottom: parent.bottom onDashboardClicked: { middlePanel.state = "Dashboard"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1325,6 +1326,8 @@ ApplicationWindow { onTransferClicked: { middlePanel.state = "Transfer"; + middlePanel.flickable.contentY = 0; + mainFlickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1333,6 +1336,7 @@ ApplicationWindow { onReceiveClicked: { middlePanel.state = "Receive"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1341,6 +1345,7 @@ ApplicationWindow { onTxkeyClicked: { middlePanel.state = "TxKey"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1349,6 +1354,7 @@ ApplicationWindow { onSharedringdbClicked: { middlePanel.state = "SharedRingDB"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1357,6 +1363,7 @@ ApplicationWindow { onHistoryClicked: { middlePanel.state = "History"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1365,6 +1372,7 @@ ApplicationWindow { onAddressBookClicked: { middlePanel.state = "AddressBook"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1373,6 +1381,7 @@ ApplicationWindow { onMiningClicked: { middlePanel.state = "Mining"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1381,6 +1390,7 @@ ApplicationWindow { onSignClicked: { middlePanel.state = "Sign"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } @@ -1389,11 +1399,12 @@ ApplicationWindow { onSettingsClicked: { middlePanel.state = "Settings"; + middlePanel.flickable.contentY = 0; if(isMobile) { hideMenu(); } updateBalance(); - } + } onKeysClicked: { passwordDialog.onAcceptedCallback = function() {