mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-26 08:03:57 -06:00
Put sidebar contents inside a scroll view
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit. Contributes to issue CURA-4148.
This commit is contained in:
parent
95ba4b9368
commit
526a42f7a0
1 changed files with 549 additions and 537 deletions
|
@ -25,6 +25,16 @@ Item
|
||||||
Component.onDestruction: PrintInformation.enabled = false
|
Component.onDestruction: PrintInformation.enabled = false
|
||||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||||
|
|
||||||
|
ScrollView
|
||||||
|
{
|
||||||
|
anchors.fill: parent
|
||||||
|
style: UM.Theme.styles.scrollview
|
||||||
|
flickableItem.flickableDirection: Flickable.VerticalFlick
|
||||||
|
|
||||||
|
Rectangle
|
||||||
|
{
|
||||||
|
width: childrenRect.width
|
||||||
|
height: childrenRect.height
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
id: infillCellLeft
|
id: infillCellLeft
|
||||||
|
@ -471,19 +481,6 @@ Item
|
||||||
onModelChanged: populateExtruderModel()
|
onModelChanged: populateExtruderModel()
|
||||||
}
|
}
|
||||||
|
|
||||||
function populateExtruderModel()
|
|
||||||
{
|
|
||||||
extruderModel.clear();
|
|
||||||
for(var extruderNumber = 0; extruderNumber < extruders.rowCount() ; extruderNumber++)
|
|
||||||
{
|
|
||||||
extruderModel.append({
|
|
||||||
text: extruders.getItem(extruderNumber).name,
|
|
||||||
color: extruders.getItem(extruderNumber).color
|
|
||||||
})
|
|
||||||
}
|
|
||||||
supportExtruderCombobox.updateCurrentColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
id: tipsCell
|
id: tipsCell
|
||||||
|
@ -604,3 +601,18 @@ Item
|
||||||
storeIndex: 0
|
storeIndex: 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function populateExtruderModel()
|
||||||
|
{
|
||||||
|
extruderModel.clear();
|
||||||
|
for(var extruderNumber = 0; extruderNumber < extruders.rowCount() ; extruderNumber++)
|
||||||
|
{
|
||||||
|
extruderModel.append({
|
||||||
|
text: extruders.getItem(extruderNumber).name,
|
||||||
|
color: extruders.getItem(extruderNumber).color
|
||||||
|
})
|
||||||
|
}
|
||||||
|
supportExtruderCombobox.updateCurrentColor();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue