From a77ad329993ae46799376689c4908de06292c801 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 6 Dec 2018 14:35:07 +0100
Subject: [PATCH] Move all the seperate tiles into loaders instead of the
 entire page

Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
---
 .../resources/qml/ToolboxDetailList.qml       |  7 ++++++-
 .../resources/qml/ToolboxDownloadsGrid.qml    | 10 ++++++----
 .../qml/ToolboxDownloadsShowcase.qml          | 19 +++++++++++--------
 .../resources/qml/ToolboxInstalledPage.qml    | 12 ++++++++++--
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
index 2e5eae098c..1700a58ebe 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
@@ -26,10 +26,15 @@ Item
             }
             height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height
             spacing: UM.Theme.getSize("default_margin").height
+
             Repeater
             {
                 model: toolbox.packagesModel
-                delegate: ToolboxDetailTile {}
+                delegate: Loader
+                {
+                    asynchronous: true
+                    source: "ToolboxDetailTile.qml"
+                }
             }
         }
     }
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
index c586828969..3e2643938b 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
@@ -24,7 +24,7 @@ Column
         color: UM.Theme.getColor("text_medium")
         font: UM.Theme.getFont("medium")
     }
-    GridLayout
+    Grid
     {
         id: grid
         width: parent.width - 2 * parent.padding
@@ -34,10 +34,12 @@ Column
         Repeater
         {
             model: gridArea.model
-            delegate: ToolboxDownloadsGridTile
+            delegate: Loader
             {
-                Layout.preferredWidth: (grid.width - (grid.columns - 1) * grid.columnSpacing) / grid.columns
-                Layout.preferredHeight: UM.Theme.getSize("toolbox_thumbnail_small").height
+                asynchronous: true
+                width: (grid.width - (grid.columns - 1) * grid.columnSpacing) / grid.columns
+                height: UM.Theme.getSize("toolbox_thumbnail_small").height
+                source: "ToolboxDownloadsGridTile.qml"
             }
         }
     }
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
index 46f5debfdd..9851128076 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcase.qml
@@ -30,23 +30,26 @@ Rectangle
             height: childrenRect.height
             spacing: UM.Theme.getSize("wide_margin").width
             columns: 3
-            anchors
-            {
-                horizontalCenter: parent.horizontalCenter
-            }
+            anchors.horizontalCenter: parent.horizontalCenter
+
             Repeater
             {
-                model: {
-                    if ( toolbox.viewCategory == "plugin" )
+                model:
+                {
+                    if (toolbox.viewCategory == "plugin")
                     {
                         return toolbox.pluginsShowcaseModel
                     }
-                    if ( toolbox.viewCategory == "material" )
+                    if (toolbox.viewCategory == "material")
                     {
                         return toolbox.materialsShowcaseModel
                     }
                 }
-                delegate: ToolboxDownloadsShowcaseTile {}
+                delegate: Loader
+                {
+                    asynchronous: true
+                    source: "ToolboxDownloadsShowcaseTile.qml"
+                }
             }
         }
     }
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index e683f89823..145e544b19 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -64,7 +64,11 @@ ScrollView
                 {
                     id: materialList
                     model: toolbox.pluginsInstalledModel
-                    delegate: ToolboxInstalledTile {}
+                    delegate: Loader
+                    {
+                        asynchronous: true
+                        source: "ToolboxInstalledTile.qml"
+                    }
                 }
             }
         }
@@ -101,7 +105,11 @@ ScrollView
                 {
                     id: pluginList
                     model: toolbox.materialsInstalledModel
-                    delegate: ToolboxInstalledTile {}
+                    delegate: Loader
+                    {
+                        asynchronous: true
+                        source: "ToolboxInstalledTile.qml"
+                    }
                 }
             }
         }