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

Align progress bar and save button better

Browse source 
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
This commit is contained in:
Ghostkeeper 2017-08-14 10:36:39 +02:00
parent addf6429e5
commit 6a4329c1a0
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/MonitorButton.qml
View file

@ -81,7 +81,6 @@ Item
}
property bool activity: CuraApplication.platformActivity;
property int totalHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
property string fileBaseName
property string statusText:
{

1
resources/qml/SaveButton.qml
View file

@ -18,7 +18,6 @@ Item {
property var backend: CuraApplication.getBackend();
property bool activity: CuraApplication.platformActivity;
property int totalHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
property string fileBaseName
property string statusText:
{

11
resources/qml/Sidebar.qml
View file

@ -397,8 +397,8 @@ Rectangle
width: parent.width
height: UM.Theme.getSize("sidebar_lining").height
color: UM.Theme.getColor("sidebar_lining")
anchors.bottom: saveButton.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
anchors.bottom: printSpecs.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
}
Rectangle
@ -408,6 +408,7 @@ Rectangle
anchors.bottom: parent.bottom
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
height: childrenRect.height
UM.TooltipArea
{
@ -517,7 +518,8 @@ Rectangle
{
id: saveButton
implicitWidth: base.width
implicitHeight: totalHeight
anchors.top: footerSeparator.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.bottom: parent.bottom
visible: !monitoringPrint
}
@ -526,7 +528,8 @@ Rectangle
{
id: monitorButton
implicitWidth: base.width
implicitHeight: totalHeight
anchors.top: footerSeparator.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.bottom: parent.bottom
visible: monitoringPrint
}