From eddf4e7f3d96296576e8124fcfd3a86e01adf7e3 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 6 Dec 2018 19:38:12 +0100
Subject: [PATCH] Simplify QML

---
 .../resources/qml/ToolboxInstalledPage.qml    | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index e683f89823..738cdde323 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -21,44 +21,39 @@ ScrollView
     Column
     {
         spacing: UM.Theme.getSize("default_margin").height
+        visible: toolbox.pluginsInstalledModel.items.length > 0
+        height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height
+
         anchors
         {
             right: parent.right
             left: parent.left
-            leftMargin: UM.Theme.getSize("wide_margin").width
-            topMargin: UM.Theme.getSize("wide_margin").height
-            bottomMargin: UM.Theme.getSize("wide_margin").height
+            margins: UM.Theme.getSize("default_margin").width
             top: parent.top
         }
-        height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height
+
         Label
         {
-            visible: toolbox.pluginsInstalledModel.items.length > 0
-            width: parent.width
+            width: page.width
             text: catalog.i18nc("@title:tab", "Plugins")
             color: UM.Theme.getColor("text_medium")
             font: UM.Theme.getFont("medium")
         }
         Rectangle
         {
-            visible: toolbox.pluginsInstalledModel.items.length > 0
             color: "transparent"
             width: parent.width
-            height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
+            height: childrenRect.height + UM.Theme.getSize("default_lining").width
             border.color: UM.Theme.getColor("lining")
             border.width: UM.Theme.getSize("default_lining").width
             Column
             {
-                height: childrenRect.height
                 anchors
                 {
                     top: parent.top
                     right: parent.right
                     left: parent.left
-                    leftMargin: UM.Theme.getSize("default_margin").width
-                    rightMargin: UM.Theme.getSize("default_margin").width
-                    topMargin: UM.Theme.getSize("default_lining").width
-                    bottomMargin: UM.Theme.getSize("default_lining").width
+                    margins: UM.Theme.getSize("default_margin").width
                 }
                 Repeater
                 {
@@ -70,32 +65,26 @@ ScrollView
         }
         Label
         {
-            visible: toolbox.materialsInstalledModel.items.length > 0
-            width: page.width
             text: catalog.i18nc("@title:tab", "Materials")
             color: UM.Theme.getColor("text_medium")
             font: UM.Theme.getFont("medium")
         }
+
         Rectangle
         {
-            visible: toolbox.materialsInstalledModel.items.length > 0
             color: "transparent"
             width: parent.width
-            height: childrenRect.height + 1 * UM.Theme.getSize("default_lining").width
+            height: childrenRect.height + UM.Theme.getSize("default_lining").width
             border.color: UM.Theme.getColor("lining")
             border.width: UM.Theme.getSize("default_lining").width
             Column
             {
-                height: Math.max( UM.Theme.getSize("wide_margin").height, childrenRect.height)
                 anchors
                 {
                     top: parent.top
                     right: parent.right
                     left: parent.left
-                    leftMargin: UM.Theme.getSize("default_margin").width
-                    rightMargin: UM.Theme.getSize("default_margin").width
-                    topMargin: UM.Theme.getSize("default_lining").width
-                    bottomMargin: UM.Theme.getSize("default_lining").width
+                    margins: UM.Theme.getSize("default_margin").width
                 }
                 Repeater
                 {