From 6a4329c1a066ad1f02f5805926dee8184c2de344 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 14 Aug 2017 10:36:39 +0200
Subject: [PATCH] Align progress bar and save button better

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

Contributes to issue CURA-4149.
---
 resources/qml/MonitorButton.qml |  1 -
 resources/qml/SaveButton.qml    |  1 -
 resources/qml/Sidebar.qml       | 11 +++++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 8fe6438b87..cfb09d9c9f 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -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:
     {
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index 6f6efad7f1..3f25283596 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -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:
     {
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 895d06322a..be572bae23 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -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
     }