mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-25 20:01:33 -07:00
Simplify materials preference page by wrapping scroll items in ListView
CURA-8979
This commit is contained in:
parent
c10865b179
commit
10339555f4
1 changed files with 75 additions and 81 deletions
|
|
@ -515,7 +515,7 @@ Item
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ScrollView
|
ListView
|
||||||
{
|
{
|
||||||
id: settingsPage
|
id: settingsPage
|
||||||
visible: pageSelectorTabRow.currentItem.activeView === "settings"
|
visible: pageSelectorTabRow.currentItem.activeView === "settings"
|
||||||
|
|
@ -530,7 +530,9 @@ Item
|
||||||
rightMargin: UM.Theme.getSize("thin_margin").width
|
rightMargin: UM.Theme.getSize("thin_margin").width
|
||||||
}
|
}
|
||||||
|
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
width: settingsPage.width
|
||||||
|
spacing: UM.Theme.getSize("narrow_margin").height
|
||||||
|
|
||||||
ScrollBar.vertical: UM.ScrollBar
|
ScrollBar.vertical: UM.ScrollBar
|
||||||
{
|
{
|
||||||
id: settingScrollBar
|
id: settingScrollBar
|
||||||
|
|
@ -545,12 +547,6 @@ Item
|
||||||
|
|
||||||
property real columnWidth: Math.floor((width - settingScrollBar.width - UM.Theme.getSize("narrow_margin").width) / 2)
|
property real columnWidth: Math.floor((width - settingScrollBar.width - UM.Theme.getSize("narrow_margin").width) / 2)
|
||||||
|
|
||||||
Column
|
|
||||||
{
|
|
||||||
width: settingsPage.width
|
|
||||||
spacing: UM.Theme.getSize("narrow_margin").height
|
|
||||||
Repeater
|
|
||||||
{
|
|
||||||
model: UM.SettingDefinitionsModel
|
model: UM.SettingDefinitionsModel
|
||||||
{
|
{
|
||||||
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
|
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
|
||||||
|
|
@ -632,8 +628,6 @@ Item
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UM.TabRow
|
UM.TabRow
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue