Tango: remove VU peak indicators from stacked layouts, remove obsolet…

…e images
mixxxdj · Apr 2, 2023 · dfa6d2e · dfa6d2e
1 parent 41ba3d6
commit dfa6d2e
Show file tree

Hide file tree

Showing 19 changed files with 151 additions and 66 deletions.
diff --git a/res/skins/Tango/graphics/vumeter_clipping.png b/res/skins/Tango/graphics/vumeter_clipping.png
diff --git a/res/skins/Tango/graphics/vumeter_clipping.svg b/res/skins/Tango/graphics/vumeter_clipping.svg
diff --git a/res/skins/Tango/graphics/vumeter_clipping_over.png b/res/skins/Tango/graphics/vumeter_clipping_over.png
diff --git a/res/skins/Tango/graphics/vumeter_clipping_over.svg b/res/skins/Tango/graphics/vumeter_clipping_over.svg
diff --git a/res/skins/Tango/graphics/vumeter_level.png b/res/skins/Tango/graphics/vumeter_level.png
diff --git a/res/skins/Tango/graphics/vumeter_level.svg b/res/skins/Tango/graphics/vumeter_level.svg
diff --git a/res/skins/Tango/graphics/vumeter_level_over.png b/res/skins/Tango/graphics/vumeter_level_over.png
diff --git a/res/skins/Tango/graphics/vumeter_level_over.svg b/res/skins/Tango/graphics/vumeter_level_over.svg
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping.png b/res/skins/Tango/graphics/vumeter_mini_clipping.png
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping.svg b/res/skins/Tango/graphics/vumeter_mini_clipping.svg
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping_over.png b/res/skins/Tango/graphics/vumeter_mini_clipping_over.png
diff --git a/res/skins/Tango/graphics/vumeter_mini_clipping_over.svg b/res/skins/Tango/graphics/vumeter_mini_clipping_over.svg
diff --git a/res/skins/Tango/graphics/vumeter_mini_level.png b/res/skins/Tango/graphics/vumeter_mini_level.png
diff --git a/res/skins/Tango/graphics/vumeter_mini_level.svg b/res/skins/Tango/graphics/vumeter_mini_level.svg
diff --git a/res/skins/Tango/mic_aux_sampler/aux_unit.xml b/res/skins/Tango/mic_aux_sampler/aux_unit.xml
@@ -44,7 +44,7 @@ Variables:
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
           <Template src="skin:../Tango/mixer/vumeter_mini.xml">
-            <SetVariable name="Size">5f,29f</SetVariable>
+            <SetVariable name="Size">4f,29f</SetVariable>
           </Template>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>

diff --git a/res/skins/Tango/mic_aux_sampler/mic_unit.xml b/res/skins/Tango/mic_aux_sampler/mic_unit.xml
@@ -48,7 +48,7 @@ Variables:
 
           <Template src="skin:../Tango/mixer/vumeter_mini.xml">
             <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
-            <SetVariable name="Size">5f,29f</SetVariable>
+            <SetVariable name="Size">4f,29f</SetVariable>
           </Template>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>

diff --git a/res/skins/Tango/mic_aux_sampler/sampler.xml b/res/skins/Tango/mic_aux_sampler/sampler.xml
@@ -226,7 +226,7 @@ Variables:
                   <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
 
                   <Template src="skin:../Tango/mixer/vumeter_mini.xml">
-                    <SetVariable name="Size">6f,1me</SetVariable>
+                    <SetVariable name="Size">4f,36f</SetVariable>
                   </Template>
 
                 </Children>

diff --git a/res/skins/Tango/mixer/vumeter_mini.xml b/res/skins/Tango/mixer/vumeter_mini.xml
@@ -10,10 +10,11 @@ Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
 -->
 <Template>
   <WidgetGroup>
-    <Size><Variable name="Size"/></Size>
-    <Layout>stacked</Layout>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,max</SizePolicy>
     <Children>
       <StatusLight>
+        <Size>2f,-1min</Size>
         <TooltipId><Variable name="sourceType"/>_VuMeter</TooltipId>
         <PathStatusLight scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_clipping_over.png</PathStatusLight>
         <PathBack scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_clipping.png</PathBack>
@@ -22,6 +23,7 @@ Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
         </Connection>
       </StatusLight>
       <VuMeter>
+        <Size><Variable name="Size"/></Size>
         <PathVu scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_level_over.png</PathVu>
         <PathBack scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_level.png</PathBack>
         <Horizontal>false</Horizontal>