Merge pull request musescore#18255 from HemantAntony/17949-aux_sends_…

…too_close Fix musescore#17949: Aux sends 1 and 2 are too close together
codecruisedor · Jul 5, 2023 · 719ecf5 · 719ecf5
2 parents 0fa70a2 + fd0aa79
commit 719ecf5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/framework/audio/qml/MuseScore/Audio/KnobControl.qml b/src/framework/audio/qml/MuseScore/Audio/KnobControl.qml
@@ -31,6 +31,7 @@ Dial {
     property alias navigation: navCtrl
 
     property real radius: 16
+    property real backgroundHeight: radius + radius * Math.sin(prv.startAngle)
 
     property bool isBalanceKnob: false
 
@@ -63,6 +64,9 @@ Dial {
         readonly property real outerArcLineWidth: 3
         readonly property real innerArcLineWidth: 2
 
+        readonly property real startAngle: -140 * (Math.PI/180) - Math.PI/2
+        readonly property real endAngle: 140 * (Math.PI/180) - Math.PI/2
+
         readonly property color valueArcColor: ui.theme.accentColor
         readonly property color outerArcColor: Utils.colorWithAlpha(ui.theme.buttonColor, 0.7)
         readonly property color innerArcColor: Utils.colorWithAlpha(ui.theme.fontPrimaryColor, 0.5)
@@ -140,7 +144,7 @@ Dial {
 
             ctx.strokeStyle = prv.outerArcColor
             ctx.beginPath()
-            ctx.arc(width/2, height/2, root.radius - prv.outerArcLineWidth/2, -140 * (Math.PI/180) - Math.PI/2, 140 * (Math.PI/180) - Math.PI/2, false)
+            ctx.arc(width/2, height/2, root.radius - prv.outerArcLineWidth/2, prv.startAngle, prv.endAngle, false)
             ctx.stroke()
 
             ctx.strokeStyle = prv.valueArcColor

diff --git a/src/playback/qml/MuseScore/Playback/MixerPanel.qml b/src/playback/qml/MuseScore/Playback/MixerPanel.qml
@@ -199,7 +199,6 @@ ColumnLayout {
                 headerVisible: contextMenuModel.labelsSectionVisible
                 headerWidth: prv.headerWidth
                 channelItemWidth: prv.channelItemWidth
-                spacingAbove: 8
 
                 model: mixerPanelModel
 
@@ -219,7 +218,6 @@ ColumnLayout {
                 headerWidth: prv.headerWidth
 
                 channelItemWidth: prv.channelItemWidth
-                spacingAbove: 8
 
                 model: mixerPanelModel
 

diff --git a/src/playback/qml/MuseScore/Playback/internal/AuxSendControl.qml b/src/playback/qml/MuseScore/Playback/internal/AuxSendControl.qml
@@ -54,7 +54,7 @@ Item {
         KnobControl {
             id: audioSignalAmountKnob
 
-            radius: root.height / 2 + 2
+            radius: root.height / 2 + 1.5
 
             from: 0
             to: 100
@@ -81,7 +81,8 @@ Item {
             readonly property bool isHovering: bypassBtn.mouseArea.containsMouse
 
             Layout.fillWidth: true
-            Layout.fillHeight: true
+            Layout.preferredHeight: audioSignalAmountKnob.backgroundHeight
+            Layout.alignment: Qt.AlignTop
 
             navigation.panel: root.navigationPanel
             navigation.row: root.navigationRowStart + 1