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
This commit is contained in:
Jaime van Kessel 2018-12-06 14:35:07 +01:00
parent 54def4edee
commit a77ad32999
4 changed files with 33 additions and 15 deletions

View file

@ -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"
}
}
}
}

View file

@ -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"
}
}
}

View file

@ -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"
}
}
}
}

View file

@ -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"
}
}
}
}