diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-23 11:28:50 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-23 11:28:50 -0500 |
| commit | a3b159028642d72546ca80e55aa0c9e8329b44a4 (patch) | |
| tree | 7db70bf2dc38c185b354bd7b1829a13c9e254af6 | |
| parent | b5cbb8b990c4ac4f9ab55d8919ecccfcbbf43dc8 (diff) | |
| parent | afe2b14430f4d659fedd25ff26aa3a2aa206d08b (diff) | |
| download | monzero-gui-a3b159028642d72546ca80e55aa0c9e8329b44a4.tar.gz monzero-gui-a3b159028642d72546ca80e55aa0c9e8329b44a4.tar.xz monzero-gui-a3b159028642d72546ca80e55aa0c9e8329b44a4.zip | |
Merge pull request #2309
afe2b14 QML: fix more warnings (selsta)
| -rw-r--r-- | MiddlePanel.qml | 8 | ||||
| -rw-r--r-- | pages/AddressBook.qml | 2 | ||||
| -rw-r--r-- | pages/merchant/Merchant.qml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 614aa6ed..a689731e 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -209,13 +209,13 @@ Rectangle { clip: true ScrollBar.vertical: ScrollBar { - parent: mainFlickable.parent + parent: root anchors.left: parent.right - anchors.leftMargin: 3 + anchors.leftMargin: -14 // 10 margin + 4 scrollbar width anchors.top: parent.top - anchors.topMargin: 4 + anchors.topMargin: persistentSettings.customDecorations ? 60 : 10 anchors.bottom: parent.bottom - anchors.bottomMargin: persistentSettings.customDecorations ? 4 : 0 + anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10 } onFlickingChanged: { diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index b79a150b..c6c07f03 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -145,7 +145,7 @@ Rectangle { ListView { id: addressBookListView Layout.fillWidth: true - anchors.fill: parent + Layout.fillHeight: true clip: true boundsBehavior: ListView.StopAtBounds interactive: false diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml index 4213b294..2ddc5255 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -627,7 +627,7 @@ Item { in_txpool = true; } else { if (blockchainHeight == null) - blockchainHeight = appWindow.currentWallet.blockChainHeight() + blockchainHeight = walletManager.blockchainHeight() confirmations = blockchainHeight - blockHeight - 1 displayAmount = model.data(idx, TransactionHistoryModel.TransactionDisplayAmountRole); } |