3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make collapsible simulation view collapse to right height

Browse source 
CURA-5829
This commit is contained in:
Jaime van Kessel 2018-11-05 16:59:06 +01:00
parent 8106df1ae2
commit 319d52a2f9
1 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

49
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -19,21 +19,7 @@ Rectangle
width: UM.Theme.getSize("layerview_menu_size").width width: UM.Theme.getSize("layerview_menu_size").width
height: height: viewSettings.collapsed ? layerViewTypesLabel.height + 2 * UM.Theme.getSize("default_margin").height : childrenRect.height
{
if (viewSettings.collapsed)
{
return UM.Theme.getSize("layerview_menu_size_collapsed").height
}
else if (UM.Preferences.getValue("layerview/layer_view_type") == 0)
{
return UM.Theme.getSize("layerview_menu_size_material_color_mode").height + UM.SimulationView.extruderCount * (UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("layerview_row_spacing").height)
}
else
{
return UM.Theme.getSize("layerview_menu_size").height + UM.SimulationView.extruderCount * (UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("layerview_row_spacing").height)
}
}
Behavior on height { NumberAnimation { duration: 100 } } Behavior on height { NumberAnimation { duration: 100 } }
@ -64,6 +50,23 @@ Rectangle
} }
} }
Label
{
id: layerViewTypesLabel
text: catalog.i18nc("@label","Color scheme")
font: UM.Theme.getFont("default");
visible: !UM.SimulationView.compatibilityMode
color: UM.Theme.getColor("setting_control_text")
height: contentHeight
anchors
{
top: parent.top
margins: UM.Theme.getSize("default_margin").height
right: collapseButton.left
left: parent.left
}
}
Button Button
{ {
id: collapseButton id: collapseButton
@ -71,9 +74,8 @@ Rectangle
anchors anchors
{ {
top: parent.top top: parent.top
topMargin: Math.round(UM.Theme.getSize("default_margin").height + (UM.Theme.getSize("layerview_row").height - UM.Theme.getSize("default_margin").height) / 2) margins: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
} }
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
@ -117,23 +119,16 @@ Rectangle
anchors anchors
{ {
top: parent.top top: layerViewTypesLabel.bottom
left: parent.left left: parent.left
right: parent.right right: parent.right
margins: UM.Theme.getSize("default_margin").height margins: UM.Theme.getSize("default_margin").height
} }
spacing: UM.Theme.getSize("layerview_row_spacing").height spacing: UM.Theme.getSize("layerview_row_spacing").height
Label visible: !collapsed
{
id: layerViewTypesLabel
text: catalog.i18nc("@label","Color scheme")
font: UM.Theme.getFont("default");
visible: !UM.SimulationView.compatibilityMode
width: parent.width
color: UM.Theme.getColor("setting_control_text")
}
ListModel // matches SimulationView.py ListModel // matches SimulationView.py
{ {