Set the height of the stage menu in the theme instead of hardcoded.

I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
This commit is contained in:
Diego Prado Gesto 2018-10-18 16:33:13 +02:00
parent fdfa81b2b8
commit 1cc7e0e586
4 changed files with 26 additions and 6 deletions

View file

@ -20,7 +20,6 @@ UM.MainWindow
// Cura application window title
title: catalog.i18nc("@title:window", "Ultimaker Cura")
viewportRect: Qt.rect(0, 0, 1.0, 1.0)
backgroundColor: UM.Theme.getColor("viewport_background")
UM.I18nCatalog
@ -143,6 +142,19 @@ UM.MainWindow
}
}
Rectangle
{
anchors
{
left: parent.left
right: parent.right
top: parent.top
}
visible: stageMenu.source != ""
height: Math.round(UM.Theme.getSize("stage_menu").height / 2)
color: UM.Theme.getColor("topheader_background")
}
Loader
{
// The stage menu is, as the name implies, a menu that is defined by the active stage.
@ -155,10 +167,9 @@ UM.MainWindow
left: parent.left
right: parent.right
top: parent.top
margins: UM.Theme.getSize("default_margin").height
}
height: 50
height: UM.Theme.getSize("stage_menu").height
source: UM.Controller.activeStage != null ? UM.Controller.activeStage.stageMenuComponent : ""
}