improve xFader highlight with AutoDJ enabled, sort toolbar indicators

daschuer · Oct 21, 2017 · f8bc651 · f8bc651
1 parent 8004154
commit f8bc651
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 148 deletions.
diff --git a/res/skins/Deere/handle-horizontal.svg → res/skins/Deere/handle-crossfader.svg b/res/skins/Deere/handle-horizontal.svg → res/skins/Deere/handle-crossfader.svg
diff --git a/res/skins/Deere/icon/ic_autodj_32px.svg b/res/skins/Deere/icon/ic_autodj_32px.svg
diff --git a/res/skins/Deere/icon/ic_broadcast_0_32px.svg b/res/skins/Deere/icon/ic_broadcast_0_32px.svg
diff --git a/res/skins/Deere/icon/ic_broadcast_1_32px.svg b/res/skins/Deere/icon/ic_broadcast_1_32px.svg
diff --git a/res/skins/Deere/icon/ic_broadcast_3_32px.svg b/res/skins/Deere/icon/ic_broadcast_3_32px.svg
diff --git a/res/skins/Deere/icon/ic_recording_0_32px.svg b/res/skins/Deere/icon/ic_recording_0_32px.svg
diff --git a/res/skins/Deere/icon/ic_recording_1_32px.svg b/res/skins/Deere/icon/ic_recording_1_32px.svg
diff --git a/res/skins/Deere/icon/ic_recording_3_32px.svg b/res/skins/Deere/icon/ic_recording_3_32px.svg
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
@@ -207,6 +207,7 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,min</SizePolicy>
                 <Children>
+                  <!-- Slider background is highlighted orange if AutoDJ is enabled -->
                   <WidgetGroup>
                     <ObjectName>Crossfader</ObjectName>
                     <SizePolicy>me,min</SizePolicy>
@@ -215,8 +216,8 @@
                       <SliderComposed>
                         <TooltipId>crossfader</TooltipId>
                         <Size>1me,40f</Size>
-                        <Slider scalemode="STRETCH">slider-horizontal.svg</Slider>
-                        <Handle scalemode="STRETCH_ASPECT">handle-horizontal.svg</Handle>
+                        <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
+                        <Handle scalemode="STRETCH_ASPECT">handle-crossfader.svg</Handle>
                         <Horizontal>true</Horizontal>
                         <Connection>
                           <ConfigKey>[Master],crossfader</ConfigKey>
@@ -226,36 +227,10 @@
                     </Children>
                     <Connection>
                       <ConfigKey>[AutoDJ],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                      <Transform><Not/></Transform>
+                      <BindProperty>highlight</BindProperty>
                     </Connection>
                   </WidgetGroup><!-- Crossfader -->
 
-                  <!-- Change crossfader background color if AutoDj is active,
-                      https://bugs.launchpad.net/mixxx/+bug/995955 -->
-                  <WidgetGroup>
-                    <ObjectName>CrossfaderAutoDjActive</ObjectName>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <SliderComposed>
-                        <TooltipId>crossfader</TooltipId>
-                        <Size>1me,40f</Size>
-                        <Slider scalemode="STRETCH">slider-horizontal.svg</Slider>
-                        <Handle scalemode="STRETCH_ASPECT">handle-horizontal.svg</Handle>
-                        <Horizontal>true</Horizontal>
-                        <Connection>
-                          <ConfigKey>[Master],crossfader</ConfigKey>
-                          <EmitOnDownPress>false</EmitOnDownPress>
-                        </Connection>
-                      </SliderComposed>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[AutoDJ],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup><!-- CrossfaderAutoDjActive -->
-
                 </Children>
               </WidgetGroup>
             </Children>