diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-08 15:32:20 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-08 15:32:20 -0400 |
| commit | d72284dc0e2aa39cc69534a8e89597ec8c93d7d7 (patch) | |
| tree | d1fd3396a5bf336cde2e66e4e3b7d28cf000e9a9 /MiddlePanel.qml | |
| parent | 98a7a9e66335c463b7a12d32f84bdf83ba75c925 (diff) | |
| parent | 7611e826aa2be305e2bfcc22361deb4d03d76c8d (diff) | |
| download | monzero-gui-d72284dc0e2aa39cc69534a8e89597ec8c93d7d7.tar.gz monzero-gui-d72284dc0e2aa39cc69534a8e89597ec8c93d7d7.tar.xz monzero-gui-d72284dc0e2aa39cc69534a8e89597ec8c93d7d7.zip | |
Merge pull request #2025
7611e82 History redesign (xmrdsc)
Diffstat (limited to 'MiddlePanel.qml')
| -rw-r--r-- | MiddlePanel.qml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index df0aa1b3..3643740b 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -118,8 +118,7 @@ Rectangle { State { name: "History" PropertyChanges { target: root; currentView: historyView } - PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null } - PropertyChanges { target: mainFlickable; contentHeight: historyView.tableHeight + 220 * scaleRatio } + PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100 * scaleRatio} }, State { name: "Transfer" PropertyChanges { target: root; currentView: transferView } @@ -186,7 +185,13 @@ Rectangle { ColumnLayout { anchors.fill: parent - anchors.margins: currentView !== merchantView ? 20 * scaleRatio : 0 + anchors.margins: { + if(currentView === merchantView || currentView === historyView) + return 0; + + return 20 * scaleRatio; + } + anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 * scaleRatio : 0 spacing: 0 |