fix required changes

musescore · Dec 5, 2024 · b519dfb · b519dfb
1 parent 9cd1188
commit b519dfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsPanel.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsPanel.qml
@@ -148,6 +148,8 @@ Item {
             TreeView {
                 id: instrumentsTreeView
 
+                readonly property real delegateHeight: 38
+
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -184,11 +186,11 @@ Item {
                 }
 
                 function scrollToFocusedItem(focusedIndex) {
-                    let targetScrollPosition = focusedIndex * 38
+                    let targetScrollPosition = focusedIndex * instrumentsTreeView.delegateHeight
                     let visibleAreaEnd = flickable.contentY + flickable.height
 
-                    if (targetScrollPosition + 38 > visibleAreaEnd) {
-                        flickable.contentY = Math.min(targetScrollPosition + 38 - flickable.height, flickable.contentHeight - flickable.height)
+                    if (targetScrollPosition + instrumentsTreeView.delegateHeight > visibleAreaEnd) {
+                        flickable.contentY = Math.min(targetScrollPosition + instrumentsTreeView.delegateHeight - flickable.height, flickable.contentHeight - flickable.height)
                     } else if (targetScrollPosition < flickable.contentY) {
                         flickable.contentY = Math.max(targetScrollPosition, 0)
                     }
@@ -230,7 +232,7 @@ Item {
                     backgroundColor: "transparent"
 
                     rowDelegate: Item {
-                        height: 38
+                        height: instrumentsTreeView.delegateHeight
                         width: parent.width
                     }
                 }

diff --git a/src/playback/qml/MuseScore/Playback/MixerPanel.qml b/src/playback/qml/MuseScore/Playback/MixerPanel.qml
@@ -69,13 +69,13 @@ ColumnLayout {
     }
 
     function scrollToFocusedItem(focusedIndex) {
-        let targetScrollPosition = (focusedIndex) * (prv.channelItemWidth + 2)
+        let targetScrollPosition = (focusedIndex) * (prv.channelItemWidth + 1) // + 1 for separators
         let maxContentX = flickable.contentWidth - flickable.width
 
         if (targetScrollPosition + prv.channelItemWidth > flickable.contentX + flickable.width) {
             flickable.contentX = Math.min(targetScrollPosition + prv.channelItemWidth - flickable.width, maxContentX)
         } else if (targetScrollPosition < flickable.contentX) {
-            flickable.contentX = Math.max(targetScrollPosition - 90, 0)
+            flickable.contentX = Math.max(targetScrollPosition - prv.channelItemWidth, 0)
         }
     }