3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

Browse source
This commit is contained in:
Diego Prado Gesto 2018-12-04 09:03:13 +01:00
commit ca3c639069
17 changed files with 537 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/Cura.qml
View file

@ -146,6 +146,7 @@ UM.MainWindow
Rectangle
{
id: stageMenuBackground
anchors
{
left: parent.left
@ -153,7 +154,7 @@ UM.MainWindow
top: parent.top
}
visible: stageMenu.source != ""
height: Math.round(UM.Theme.getSize("stage_menu").height / 2)
height: visible ? Math.round(UM.Theme.getSize("stage_menu").height / 2) : 0
LinearGradient
{
@ -247,7 +248,13 @@ UM.MainWindow
// A stage can control this area. If nothing is set, it will therefore show the 3D view.
id: main
anchors.fill: parent
anchors
{
top: stageMenuBackground.bottom
left: parent.left
right: parent.right
bottom: parent.bottom
}
source: UM.Controller.activeStage != null ? UM.Controller.activeStage.mainComponent : ""
}