GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 14:49:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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 bool activity: CuraApplication.platformActivity;
property int totalHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
property string fileBaseName property string fileBaseName
property string statusText: property string statusText:
{ {

1
resources/qml/SaveButton.qml
View File

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

11
resources/qml/Sidebar.qml
View File

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