mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-09-13 17:53:13 +08:00
Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn.
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it. CURA-5772
This commit is contained in:
parent
a473a46a35
commit
a7edd893d7
@ -207,6 +207,36 @@ UM.MainWindow
|
||||
}
|
||||
}
|
||||
|
||||
ViewOrientationControls
|
||||
{
|
||||
id: viewOrientationControls
|
||||
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
bottom: parent.bottom
|
||||
}
|
||||
}
|
||||
|
||||
ProgressAndSaveWidget
|
||||
{
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
width: UM.Theme.getSize("sidebar").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
onShowTooltip:
|
||||
{
|
||||
base.showTooltip(item, location, text)
|
||||
}
|
||||
onHideTooltip:
|
||||
{
|
||||
base.hideTooltip()
|
||||
}
|
||||
}
|
||||
|
||||
Loader
|
||||
{
|
||||
// A stage can control this area. If nothing is set, it will therefor show the 3D view.
|
||||
@ -242,36 +272,6 @@ UM.MainWindow
|
||||
bottomMargin: UM.Theme.getSize("default_margin").height
|
||||
}
|
||||
}
|
||||
|
||||
ViewOrientationControls
|
||||
{
|
||||
id: viewOrientationControls
|
||||
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
bottom: parent.bottom
|
||||
}
|
||||
}
|
||||
|
||||
ProgressAndSaveWidget
|
||||
{
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
width: UM.Theme.getSize("sidebar").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
onShowTooltip:
|
||||
{
|
||||
base.showTooltip(item, location, text)
|
||||
}
|
||||
onHideTooltip:
|
||||
{
|
||||
base.hideTooltip()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SidebarTooltip
|
||||
|
Loading…
x
Reference in New Issue
Block a user