Merge pull request #2318 from ronso0/tango-slider-scaling-fixes

Tango 2.2 :: scaling fixes for sliders
mixxxdj · Oct 7, 2019 · 2af2e64 · 2af2e64
2 parents b9de27a + c11765c
commit 2af2e64
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 17 deletions.
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
@@ -66,10 +66,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>

diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
@@ -54,10 +54,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>

diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
@@ -66,10 +66,10 @@ Description:
 
           <SliderComposed>
             <TooltipId>headMix</TooltipId>
+            <Size>60f,24f</Size>
             <ObjectName>MixerbarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>knobs_sliders/headMix_handle.svg</Handle>
-            <Slider>knobs_sliders/headMix_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/headMix_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/headMix_scale.svg</Slider>
             <Horizontal>true</Horizontal>
             <Connection>
               <ConfigKey>[Master],headMix</ConfigKey>

diff --git a/res/skins/Tango/mixer_master_booth.xml b/res/skins/Tango/mixer_master_booth.xml
@@ -31,9 +31,9 @@ Description:
           <SliderComposed>
             <TooltipId>balance</TooltipId>
             <ObjectName>MixerbarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>knobs_sliders/balance_handle.svg</Handle>
-            <Slider>knobs_sliders/balance_scale.svg</Slider>
+            <Size>48f,24f</Size>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/balance_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/balance_scale.svg</Slider>
             <Horizontal>true</Horizontal>
             <Connection>
               <ConfigKey>[Master],balance</ConfigKey>

diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/rate_pitch_key.xml
@@ -169,7 +169,7 @@ Variables:
             <MaximumSize>50,136</MaximumSize>
             <SizePolicy>f,me</SizePolicy>
             <TooltipId>rate</TooltipId>
-            <Handle>knobs_sliders/pitch_handle.svg</Handle>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_handle.svg</Handle>
             <Slider scalemode="STRETCH">knobs_sliders/pitch_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>

diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
@@ -239,8 +239,8 @@ Variables:
             <ObjectName>SamplerPitchSlider</ObjectName>
             <TooltipId>rate</TooltipId>
             <Size>20f,54f</Size>
-            <Handle>knobs_sliders/pitch_sampler_handle.svg</Handle>
-            <Slider>knobs_sliders/pitch_sampler_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,rate</ConfigKey>

diff --git a/res/skins/Tango/spinnyCover_maxi.xml b/res/skins/Tango/spinnyCover_maxi.xml
@@ -67,7 +67,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>111f,111f</Size>
             <Group><Variable name="group"/></Group>
-            <DefaultCover>skin:/graphics/cover_default.svg</DefaultCover>
+            <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>

diff --git a/res/skins/Tango/spinnyCover_mini.xml b/res/skins/Tango/spinnyCover_mini.xml
@@ -69,7 +69,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>50f,50f</Size>
             <Group>[Channel<Variable name="chanNum"/>]</Group>
-            <DefaultCover>skin:/graphics/cover_default_mini_<Variable name="chanNum"/>.svg</DefaultCover>
+            <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default_mini_<Variable name="chanNum"/>.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>

diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
@@ -117,8 +117,9 @@ Description:
 		                <Children>
 		                  <SliderComposed>
 		                    <TooltipId>crossfader</TooltipId>
-		                    <Handle>knobs_sliders/crossfader_handle.svg</Handle>
-		                    <Slider>knobs_sliders/crossfader_scale.svg</Slider>
+		                    <Size>108f,32f</Size>
+		                    <Handle scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_handle.svg</Handle>
+		                    <Slider scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_scale.svg</Slider>
 		                    <Horizontal>true</Horizontal>
 		                    <Connection>
 		                      <ConfigKey>[Master],crossfader</ConfigKey>