monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 08:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QML: fix more warnings

Browse source
This commit is contained in:
selsta 2019-07-22 21:39:56 +02:00
parent a65222d057
commit afe2b14430
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MiddlePanel.qml
View file

@ -209,13 +209,13 @@ Rectangle {
clip: true clip: true
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {
parent: mainFlickable.parent parent: root
anchors.left: parent.right anchors.left: parent.right
anchors.leftMargin: 3 anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 4 anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: persistentSettings.customDecorations ? 4 : 0 anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
} }
onFlickingChanged: { onFlickingChanged: {

2
pages/AddressBook.qml
View file

@ -145,7 +145,7 @@ Rectangle {
ListView { ListView {
id: addressBookListView id: addressBookListView
Layout.fillWidth: true Layout.fillWidth: true
anchors.fill: parent Layout.fillHeight: true
clip: true clip: true
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
interactive: false interactive: false

2
pages/merchant/Merchant.qml
View file

@ -627,7 +627,7 @@ Item {
in_txpool = true; in_txpool = true;
} else { } else {
if (blockchainHeight == null) if (blockchainHeight == null)
blockchainHeight = appWindow.currentWallet.blockChainHeight() blockchainHeight = walletManager.blockchainHeight()
confirmations = blockchainHeight - blockHeight - 1 confirmations = blockchainHeight - blockHeight - 1
displayAmount = model.data(idx, TransactionHistoryModel.TransactionDisplayAmountRole); displayAmount = model.data(idx, TransactionHistoryModel.TransactionDisplayAmountRole);
} }