From 6d56b52913190016933f2885b98ae1a9ef700183 Mon Sep 17 00:00:00 2001
From: Nino van Hooff <ninovanhooff@gmail.com>
Date: Thu, 2 Apr 2020 15:15:05 +0200
Subject: [PATCH] Revert "Fix binding loop in action panel widget"

Fix improper player slider layout which was introduced in 5cfe71e5
---
 resources/qml/ActionButton.qml                  | 11 ++++++++++-
 resources/qml/ActionPanel/ActionPanelWidget.qml |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 6d28d0ed52..03c5a84cb4 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -49,6 +49,15 @@ Button
     height: UM.Theme.getSize("action_button").height
     hoverEnabled: true
 
+    Component.onCompleted: {
+        if(fixedWidthMode){
+            buttonText.width = width - leftPadding - rightPadding
+        } else {
+            buttonText.width = (maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined
+        }
+    }
+
+
     contentItem: Row
     {
         spacing: UM.Theme.getSize("narrow_margin").width
@@ -84,9 +93,9 @@ Button
             font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
+            // width is set by parent because it depends on button.fixedWidthMode
             height: parent.height
             anchors.verticalCenter: parent.verticalCenter
-            width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             elide: Text.ElideRight
diff --git a/resources/qml/ActionPanel/ActionPanelWidget.qml b/resources/qml/ActionPanel/ActionPanelWidget.qml
index 4d9a5eeb69..deb7275e78 100644
--- a/resources/qml/ActionPanel/ActionPanelWidget.qml
+++ b/resources/qml/ActionPanel/ActionPanelWidget.qml
@@ -15,6 +15,7 @@ import Cura 1.0 as Cura
 Item
 {
     id: base
+    width: actionPanelWidget.width + additionalComponents.width
     height: childrenRect.height
     visible: CuraApplication.platformActivity