From f20ab12cf3bd7575e7c0043c64de3ab74c211218 Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Sun, 21 Jul 2019 21:51:47 +0200
Subject: QML: fix various warnings

---
 pages/Account.qml           |  2 +-
 pages/History.qml           |  3 ---
 pages/Receive.qml           |  2 +-
 pages/merchant/Merchant.qml | 11 ++++-------
 4 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'pages')

diff --git a/pages/Account.qml b/pages/Account.qml
index 4709aede..842a986d 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 630690ae..9586f942 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
-- 
cgit v1.2.3