From 10f9ae4082d81acc26923ff29635472bcc11c55a Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Thu, 28 Dec 2017 16:21:29 +0100
Subject: [PATCH] Resolve binding loop

Let's align the icons to the text instead of the text to the icons. This makes it all align from left to right and allows the button to take the width of the childrenRect properly.
---
 resources/themes/cura-light/styles.qml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index 0de761b7d9..7532f0dfaf 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -202,9 +202,8 @@ QtObject {
                     height: Theme.getSize("topbar_button_icon").height
                     Label
                     {
+                        id: button_label
                         text: control.text;
-                        anchors.right: (icon.visible || overlayIcon.visible) ? icon.left : parent.right
-                        anchors.rightMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
                         anchors.verticalCenter: parent.verticalCenter;
                         font: control.checked ? UM.Theme.getFont("large") : UM.Theme.getFont("large_nonbold")
                         color:
@@ -227,6 +226,8 @@ QtObject {
                     {
                         visible: control.iconSource != ""
                         id: icon
+                        anchors.left: button_label.right
+                        anchors.leftMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
                         color: UM.Theme.getColor("text_emphasis")
                         opacity: !control.enabled ? 0.2 : 1.0
                         source: control.iconSource
@@ -238,6 +239,8 @@ QtObject {
                     UM.RecolorImage
                     {
                         id: overlayIcon
+                        anchors.left: button_label.right
+                        anchors.leftMargin: (icon.visible || overlayIcon.visible) ? Theme.getSize("default_margin").width : 0
                         visible: control.overlayIconSource != "" && control.iconSource != ""
                         color: control.overlayColor
                         opacity: !control.enabled ? 0.2 : 1.0