diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-22 13:29:31 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-22 13:29:31 -0500 |
| commit | 25e56ee8fba6b0b87f3cb6d1986eebfee138edfa (patch) | |
| tree | ca470a3f46f947e51f530c28c76135f5cf813af8 /pages | |
| parent | 40c3e38f5a8577039f339586e572bcbea4a41128 (diff) | |
| parent | f20ab12cf3bd7575e7c0043c64de3ab74c211218 (diff) | |
| download | monzero-gui-25e56ee8fba6b0b87f3cb6d1986eebfee138edfa.tar.gz monzero-gui-25e56ee8fba6b0b87f3cb6d1986eebfee138edfa.tar.xz monzero-gui-25e56ee8fba6b0b87f3cb6d1986eebfee138edfa.zip | |
Merge pull request #2307
f20ab12 QML: fix various warnings (selsta)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Account.qml | 2 | ||||
| -rw-r--r-- | pages/History.qml | 3 | ||||
| -rw-r--r-- | pages/Receive.qml | 2 | ||||
| -rw-r--r-- | pages/merchant/Merchant.qml | 11 |
4 files changed, 6 insertions, 12 deletions
diff --git a/pages/Account.qml b/pages/Account.qml index 4f7dcce4..9cae2836 100644 --- a/pages/Account.qml +++ b/pages/Account.qml @@ -177,7 +177,7 @@ Rectangle { ListView { id: subaddressAccountListView Layout.fillWidth: true - anchors.fill: parent + Layout.fillHeight: true clip: true boundsBehavior: ListView.StopAtBounds interactive: false diff --git a/pages/History.qml b/pages/History.qml index d35657a3..97b26fa2 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -251,7 +251,6 @@ Rectangle { font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString color: root.sortBy === "blockheight" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor - anchors.verticalCenter: parent.verticalCenter themeTransition: false } @@ -312,7 +311,6 @@ Rectangle { text: qsTr("Date") + translationManager.emptyString color: root.sortBy === "timestamp" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false - anchors.verticalCenter: parent.verticalCenter } MoneroEffects.ImageMask { @@ -372,7 +370,6 @@ Rectangle { text: qsTr("Amount") + translationManager.emptyString color: root.sortBy === "amount" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false - anchors.verticalCenter: parent.verticalCenter } MoneroEffects.ImageMask { diff --git a/pages/Receive.qml b/pages/Receive.qml index f33525ad..55d6f932 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -101,7 +101,7 @@ Rectangle { ListView { id: subaddressListView 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 0f0630aa..4213b294 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -93,9 +93,8 @@ Item { anchors.right: parent.right Item { - height: 220 - anchors.left: parent.left - anchors.right: parent.right + Layout.preferredHeight: 220 + Layout.fillWidth: true Rectangle { id: tracker @@ -258,8 +257,7 @@ Item { Item { Layout.preferredHeight: 40 - anchors.left: parent.left - anchors.right: parent.right + Layout.fillWidth: true Item { width: (parent.width - qrImg.width) - (50) @@ -524,8 +522,7 @@ Item { Item { Layout.topMargin: 32 Layout.preferredHeight: 40 - anchors.left: parent.left - anchors.right: parent.right + Layout.fillWidth: true ColumnLayout { spacing: 16 |