GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 19:43:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn.

Browse Source 
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:
Jaime van Kessel 2018-10-15 15:08:58 +02:00
parent a473a46a35
commit a7edd893d7
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
resources/qml/Cura.qml
View File

@ -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 Loader
{ {
// A stage can control this area. If nothing is set, it will therefor show the 3D view. // 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 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 SidebarTooltip