Merge pull request #10913 from m0dB/crossfader_with_autodj

Crossfader with autodj
mixxxdj · Oct 21, 2022 · 6d6b452 · 6d6b452
2 parents 51c811a + 98e1a9f
commit 6d6b452
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 16 deletions.
diff --git a/res/skins/LateNight/mixer/singletons.xml b/res/skins/LateNight/mixer/singletons.xml
@@ -7,23 +7,41 @@
   <SingletonDefinition>
     <ObjectName>CrossfaderSingleton</ObjectName>
     <Children>
-      <SliderComposed>
-        <TooltipId>crossfader</TooltipId>
+      <WidgetGroup>
         <Size>115f,40f</Size>
-        <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_crossfader.svg</Handle>
-        <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_crossfader.svg</Slider>
-        <Horizontal>true</Horizontal>
-        <BarColor><Variable name="BarColorCrossfader"/></BarColor>
-        <BarWidth><Variable name="BarWidth"/></BarWidth>
-        <BarMargins><Variable name="BarMarginCrossfader"/></BarMargins>
-        <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
-        <BarRoundCaps>true</BarRoundCaps>
-        <BarAxisPos>19.0</BarAxisPos>
-        <BarUnipolar>false</BarUnipolar>
-        <Connection>
-          <ConfigKey>[Master],crossfader</ConfigKey>
-        </Connection>
-      </SliderComposed>
+        <Children>
+          <!-- WidgetGroup around slider to draw a style border
+          around it when AutoDJ is enabled. Note that it doesn't
+          work without the extra outer WidgetGroup -->
+          <WidgetGroup>
+            <Size>115f,40f</Size>
+            <ObjectName>CrossfaderContainer</ObjectName>
+            <Connection>
+              <ConfigKey>[AutoDJ],enabled</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+            <Children>
+              <SliderComposed>
+                <TooltipId>crossfader</TooltipId>
+                <Size>115f,40f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_crossfader.svg</Handle>
+                <Slider visible="false" scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_crossfader.svg</Slider>
+                <Horizontal>true</Horizontal>
+                <BarColor><Variable name="BarColorCrossfader"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginCrossfader"/></BarMargins>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>19.0</BarAxisPos>
+                <BarUnipolar>false</BarUnipolar>
+                <Connection>
+                  <ConfigKey>[Master],crossfader</ConfigKey>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
     </Children>
   </SingletonDefinition>
 

diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
@@ -668,6 +668,10 @@ WLibrary {
 
 /************** Mixer *********************************************************/
 
+#CrossfaderContainer[highlight="1"] {
+  border:  1px solid #cf9200;
+}
+
 #MixerDecks {
   padding: 2px 6px 2px 6px;
   }

diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
@@ -717,6 +717,10 @@ WBeatSpinBox::down-button,
 
 /************** Mixer ***************************************************/
 
+#CrossfaderContainer[highlight="1"] {
+  border:  1px solid #b2421c;
+}
+
 #MixerDecks {
   padding: 2px 5px 2px 5px;
   }