From 01b5f21fead12b618c7b2f004d70c26e3661a677 Mon Sep 17 00:00:00 2001
From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com>
Date: Tue, 31 Dec 2024 03:02:00 +0100
Subject: [PATCH] Fix binding loop in AudioResourceControl, and simplify

This finally fixes the long-standing binding loop on the `itemImplicitWidth` binding inside the FlatButton in `titleLoader`. It is still unclear what was precisely the cause; a vague theory might be that asking for `titleLoader.width` inside the FlatButton inside the `titleLoader` might somehow depend on the FlatButton's implicitWidth, which indeed depends on `itemImplicitWidth`, and perhaps StyledTextLabel's `implicitWidth` depends on its `width` because of elision/wrap mode? We'll probably never know, but anyway, it's fixed now.
---
 .../internal/AudioResourceControl.qml         | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml b/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml
index 34379ece7f167..c15b075304a0c 100644
--- a/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml
+++ b/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml
@@ -81,8 +81,8 @@ Item {
         Loader {
             id: activityLoader
 
-            Layout.preferredWidth: activityLoader.active ? root.height : 0
-            Layout.preferredHeight: root.height
+            Layout.fillHeight: true
+            Layout.preferredWidth: root.height
             Layout.alignment: Qt.AlignLeft
 
             visible: root.supportsByPassing && root.showAdditionalButtons
@@ -161,7 +161,7 @@ Item {
             id: titleLoader
 
             Layout.fillWidth: true
-            Layout.preferredHeight: root.height
+            Layout.fillHeight: true
 
             visible: root.supportsTitle
             active: visible
@@ -169,8 +169,7 @@ Item {
             sourceComponent: FlatButton {
                 id: titleButton
 
-                height: root.height
-                width: titleLoader.width
+                anchors.fill: parent
 
                 enabled: root.showAdditionalButtons
                          ? (root.resourceItemModel ? root.resourceItemModel.hasNativeEditorSupport : false)
@@ -230,9 +229,8 @@ Item {
                 }
 
                 contentItem: StyledTextLabel {
-                    // To do: this causes a binding loop warning
-                    width: titleLoader.width - 8 // 4px padding on each side
-                    height: root.height
+                    width: titleButton.width - 8 // 4px padding on each side
+                    height: titleButton.height
 
                     text: root.title
                 }
@@ -247,8 +245,8 @@ Item {
             id: selectorLoader
 
             Layout.fillWidth: !titleLoader.visible
+            Layout.fillHeight: true
             Layout.preferredWidth: root.height
-            Layout.preferredHeight: root.height
             Layout.alignment: Qt.AlignRight
 
             visible: root.showAdditionalButtons && root.supportsMenu
@@ -268,12 +266,12 @@ Item {
                 }
 
                 contentItem: Item {
-                    width: titleLoader.visible ? root.height : root.width
-                    height: root.height
+                    width: menuButton.width
+                    height: menuButton.height
 
                     StyledIconLabel {
                         anchors.right: parent.right
-                        width: selectorLoader.Layout.preferredWidth
+                        width: titleLoader.visible ? parent.width : parent.height
                         height: parent.height
                         iconCode: IconCode.SMALL_ARROW_DOWN
                     }