From 477997cf61edb593f0286f79dd1ec3af0c3cac53 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 10 Apr 2020 16:37:25 +0200
Subject: [PATCH 1/2] WidgetGroup: add default index0 widget to stacked layout

Fixes https://bugs.launchpad.net/mixxx/+bug/1627859
Previously, the first widget in a stacked layout was always visible
after skin load regardless of the 'visible' CO value. Adding a
zero-sized dummy widget at index 0 here avoids having to do that in
skin xml files.
---
 src/widget/wwidgetgroup.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/widget/wwidgetgroup.cpp b/src/widget/wwidgetgroup.cpp
index 3fa1d2cae4fe..f83b8f5b0b70 100644
--- a/src/widget/wwidgetgroup.cpp
+++ b/src/widget/wwidgetgroup.cpp
@@ -128,6 +128,12 @@ void WWidgetGroup::setup(const QDomNode& node, const SkinContext& context) {
             auto pStackedLayout = new QStackedLayout();
             pStackedLayout->setStackingMode(QStackedLayout::StackAll);
             pLayout = pStackedLayout;
+            // Adding a zero-size dummy widget as index 0 here before
+            // any child is added in the xml template works around
+            // https://bugs.launchpad.net/mixxx/+bug/1627859
+            QWidget *dummyWidget = new QWidget();
+            dummyWidget->setFixedSize(0, 0);
+            pLayout->addWidget(dummyWidget);
         }
 
         // Set common layout parameters.

From 15dcec9f793b47996cd715b8bfa2831818e2c3df Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 10 Apr 2020 17:44:18 +0200
Subject: [PATCH 2/2] remove stacked layout workarounds from skins

---
 res/skins/LateNight/skin_settings.xml         | 21 ---------
 .../Tango (64 Samplers)/skin_settings.xml     | 43 -------------------
 res/skins/Tango/aux_unit.xml                  |  4 --
 res/skins/Tango/deck_row_overview_right.xml   |  2 +-
 res/skins/Tango/fx_unit_left_mini.xml         |  4 --
 res/skins/Tango/fx_unit_right_mini.xml        |  4 --
 res/skins/Tango/mic_aux_rack.xml              | 36 ++++------------
 res/skins/Tango/mic_unit.xml                  |  4 --
 res/skins/Tango/mixer_channel_left.xml        |  4 --
 res/skins/Tango/mixer_channel_right.xml       |  4 --
 res/skins/Tango/mixer_headphone.xml           | 13 +-----
 res/skins/Tango/preview_deck.xml              |  3 --
 res/skins/Tango/sampler.xml                   |  4 --
 res/skins/Tango/skin_settings.xml             | 30 -------------
 res/skins/Tango/vinyl_controls_left.xml       | 11 ++---
 res/skins/Tango/vinyl_controls_right.xml      | 11 ++---
 16 files changed, 17 insertions(+), 181 deletions(-)

diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index e35cc66b05bc..9cd9686d7266 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -85,8 +85,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>stacked</Layout>
@@ -131,8 +129,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>190f,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
                   <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
@@ -179,9 +175,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
@@ -205,9 +198,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
@@ -231,9 +221,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
@@ -277,9 +264,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>stacked</Layout>
@@ -302,9 +286,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>stacked</Layout>
@@ -348,8 +329,6 @@ Description:
                 <Layout>stacked</Layout>
                 <Size>180min,17f</Size>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>stacked</Layout>
diff --git a/res/skins/Tango (64 Samplers)/skin_settings.xml b/res/skins/Tango (64 Samplers)/skin_settings.xml
index 8d4a80e19ee4..091fdea29a80 100644
--- a/res/skins/Tango (64 Samplers)/skin_settings.xml	
+++ b/res/skins/Tango (64 Samplers)/skin_settings.xml	
@@ -92,9 +92,6 @@ Description:
                 <SizePolicy>me,me</SizePolicy>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <WidgetGroup><!-- translucent cover when Hot Cues are invisble -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
@@ -105,7 +102,6 @@ Description:
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
-
                   <WidgetGroup>
                     <MinimumSize>182,13</MinimumSize>
                     <MaximumSize>182,20</MaximumSize>
@@ -183,9 +179,6 @@ Description:
                     <Layout>stacked</Layout>
                     <Size>16f,15f</Size>
                     <Children>
-                      <!-- index 0 due to bug -->
-                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                       <!-- translucent cover when Stars don't fit into transport row -->
                       <WidgetGroup>
                         <ObjectName>SubmenuCover</ObjectName>
@@ -197,7 +190,6 @@ Description:
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup>
-
                       <Template src="skin:../Tango/button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                         <SetVariable name="Size">16f,15f</SetVariable>
@@ -279,9 +271,6 @@ Description:
             <MaximumSize>-1,40</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Pitch slider is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -295,7 +284,6 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <Size>182f,0me</Size>
@@ -305,7 +293,6 @@ Description:
                     <SetVariable name="width">182</SetVariable>
                     <SetVariable name="Setting">[Tango],key_display_match</SetVariable>
                   </Template>
-
                   <Template src="skin:../Tango/skin_settings_button_2state.xml">
                     <SetVariable name="text">Rate/Key Adjustment Buttons</SetVariable>
                     <SetVariable name="width">182</SetVariable>
@@ -385,9 +372,6 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Spinny/Cover is disabled -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -398,7 +382,6 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <!-- hint: enforced small cover/spinny with mixer -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -531,9 +514,6 @@ Description:
             <MaximumSize>182,60</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Channel Mixer is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -555,16 +535,12 @@ Description:
                     <SetVariable name="text">EQ &amp; QuickEffect Knobs</SetVariable>
                     <SetVariable name="Setting">[Skin],show_eq_knobs</SetVariable>
                   </Template>
-
                   <WidgetGroup><!-- EQ Kill buttons -->
                     <Layout>stacked</Layout>
                     <MinimumSize>182,13</MinimumSize>
                     <MaximumSize>182,20</MaximumSize>
                     <SizePolicy>me,me</SizePolicy>
                     <Children>
-                      <!-- index 0 due to bug -->
-                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                       <!-- translucent cover when EQ knobs are hidden -->
                       <WidgetGroup>
                         <ObjectName>SubmenuCover</ObjectName>
@@ -578,12 +554,10 @@ Description:
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup>
-
                       <Template src="skin:../Tango/skin_settings_button_2state.xml">
                         <SetVariable name="text">EQ Kill Buttons</SetVariable>
                         <SetVariable name="Setting">[Skin],show_eq_kill_buttons</SetVariable>
                       </Template>
-
                     </Children>
                   </WidgetGroup><!-- /EQ Kill buttons -->
 
@@ -604,9 +578,6 @@ Description:
             <MaximumSize>182,20</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Channel Mixer is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -619,7 +590,6 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <Template src="skin:../Tango/skin_settings_button_2state.xml">
                 <SetVariable name="text">Always Show Level Meters</SetVariable>
                 <SetVariable name="Setting">[Tango],vumeter</SetVariable>
@@ -656,9 +626,6 @@ Description:
                 <Size>40f,20f</Size>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- translucent cover when Effects are invisible -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
@@ -670,7 +637,6 @@ Description:
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
-
                   <WidgetGroup>
                     <ObjectName>AlignVCenter</ObjectName>
                     <Size>40f,20f</Size>
@@ -701,9 +667,6 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Effects are invisble -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -715,7 +678,6 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <Template src="skin:../Tango/skin_settings_button_2state.xml">
                 <SetVariable name="text">Super Knobs</SetVariable>
                 <SetVariable name="Setting">[Skin],show_superknobs</SetVariable>
@@ -772,9 +734,6 @@ Description:
                 <MaximumSize>112,20</MaximumSize>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- translucent cover when Samlers are hidden -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
@@ -788,9 +747,7 @@ Description:
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
-
                   <Template src="skin:skin_settings_sampler_rows_64.xml"/>
-
                 </Children>
               </WidgetGroup><!-- /Sampler row buttons -->
             </Children>
diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/aux_unit.xml
index 9b73bab49906..a3bff95f6b33 100644
--- a/res/skins/Tango/aux_unit.xml
+++ b/res/skins/Tango/aux_unit.xml
@@ -69,12 +69,8 @@ Variables:
                 <Size>18f,18f</Size>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- Greyed out if no headphone device is configured -->
                   <Template src="skin:pfl_cover.xml"/>
-
                   <Template src="skin:button_2state.xml">
                     <SetVariable name="TooltipId">pfl</SetVariable>
                     <SetVariable name="ObjectName">PflButton</SetVariable>
diff --git a/res/skins/Tango/deck_row_overview_right.xml b/res/skins/Tango/deck_row_overview_right.xml
index 2cd23ac86689..b95f7198b203 100644
--- a/res/skins/Tango/deck_row_overview_right.xml
+++ b/res/skins/Tango/deck_row_overview_right.xml
@@ -18,7 +18,7 @@ Variables:
 <Template>
   <WidgetGroup>
     <ObjectName>Spacer0f</ObjectName>
-    <Layout>stacked</Layout>
+    <Layout>horizontal</Layout>
     <SizePolicy>me,f</SizePolicy>
     <Children>
       <WidgetGroup>
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index 238967e35594..d9ca7ada86c3 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -181,12 +181,8 @@ Variables:
                 <SizePolicy>max,max</SizePolicy>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-        
                   <!-- Greyed out if no headphone device is configured -->
                   <Template src="skin:pfl_cover.xml"/>
-        
                   <Template src="skin:button_2state.xml">
                     <SetVariable name="ObjectName">PflButton</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index 7fa17a6e61e6..d1dc28538a53 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -150,12 +150,8 @@ Variables:
                 <SizePolicy>max,max</SizePolicy>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-        
                   <!-- Greyed out if no headphone device is configured -->
                   <Template src="skin:pfl_cover.xml"/>
-        
                   <Template src="skin:button_2state.xml">
                     <SetVariable name="ObjectName">PflButton</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
diff --git a/res/skins/Tango/mic_aux_rack.xml b/res/skins/Tango/mic_aux_rack.xml
index 78bac002601e..480d8b802d9e 100644
--- a/res/skins/Tango/mic_aux_rack.xml
+++ b/res/skins/Tango/mic_aux_rack.xml
@@ -83,34 +83,14 @@ Description:
 
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-                  <WidgetGroup><!-- Duck strength, hidden when Duck is OFF -->
-                    <Layout>stacked</Layout>
-                    <SizePolicy>max,min</SizePolicy>
-                    <Children>
-                      <!-- index 0 due to bug -->
-                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
-                      <WidgetGroup><!-- translucent cover when ducking is off -->
-                        <ObjectName>GuiCover</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Connection>
-                          <ConfigKey persist="true">[Master],talkoverDucking</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                          <Transform><Not/></Transform>
-                        </Connection>
-                      </WidgetGroup>
-
-                      <Template src="skin:knob_textless.xml">
-                        <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
-                        <SetVariable name="ObjectName">MicAuxKnob</SetVariable>
-                        <SetVariable name="Size">30f,30f</SetVariable>
-                        <SetVariable name="group">[Master]</SetVariable>
-                        <SetVariable name="ConfigKey">duckStrength</SetVariable>
-                        <SetVariable name="Color">blue</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup><!-- /Duck strength, hidden when Duck is OFF -->
+                  <Template src="skin:knob_textless.xml">
+                    <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
+                    <SetVariable name="ObjectName">MicAuxKnob</SetVariable>
+                    <SetVariable name="Size">30f,30f</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="ConfigKey">duckStrength</SetVariable>
+                    <SetVariable name="Color">blue</SetVariable>
+                  </Template>
 
                   <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/mic_unit.xml b/res/skins/Tango/mic_unit.xml
index fdc3e919cba1..4a7687b54823 100644
--- a/res/skins/Tango/mic_unit.xml
+++ b/res/skins/Tango/mic_unit.xml
@@ -68,12 +68,8 @@ Variables:
             <Size>20f,20f</Size>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- Greyed out if no headphone device is configured -->
               <Template src="skin:pfl_cover.xml"/>
-
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 8e2c69eb0cfb..072d792e8e10 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -105,12 +105,8 @@ Variables:
             <Size>25f,25f</Size>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- Greyed out if no headphone device is configured -->
               <Template src="skin:pfl_cover.xml"/>
-
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index d5c383f09b60..932a7ccd672c 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -29,12 +29,8 @@ Variables:
             <Size>25f,25f</Size>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- Greyed out if no headphone device is configured -->
               <Template src="skin:pfl_cover.xml"/>
-
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
index 288afc6b1d5d..51f988b2b6e5 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer_headphone.xml
@@ -18,9 +18,6 @@ Description:
         <Layout>stacked</Layout>
         <SizePolicy>max,max</SizePolicy>
         <Children>
-          <!-- index 0 due to bug -->
-          <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
           <!-- Headphone controls greyed out if no headphone device configured -->
           <WidgetGroup>
             <Layout>vertical</Layout>
@@ -49,7 +46,6 @@ Description:
             <Layout>horizontal</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-
               <WidgetGroup>
                 <ObjectName>MixerbarKnob</ObjectName>
                 <Layout>vertical</Layout>
@@ -69,7 +65,6 @@ Description:
                   </KnobComposed>
                 </Children>
               </WidgetGroup>
-
               <SliderComposed>
                 <TooltipId>headMix</TooltipId>
                 <Size>60f,24f</Size>
@@ -81,9 +76,7 @@ Description:
                   <ConfigKey>[Master],headMix</ConfigKey>
                 </Connection>
               </SliderComposed>
-
-              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-
+                <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">headSplit</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
@@ -92,9 +85,7 @@ Description:
                 <SetVariable name="state_1_icon">headSplit_on.svg</SetVariable>
                 <SetVariable name="ConfigKey">[Master],headSplit</SetVariable>
               </Template>
-
-              <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-
+                <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
             </Children>
           </WidgetGroup><!-- /actual headphone controls -->
 
diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/preview_deck.xml
index 8be1dbf35cde..f1a8a793a026 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/preview_deck.xml
@@ -16,9 +16,6 @@ Variables:
     <Layout>stacked</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
-      <!-- index 0 due to bug -->
-      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
       <!-- Greyed out if no headphone device is configured -->
       <WidgetGroup>
         <ObjectName>GuiCover</ObjectName>
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 9d63db869c5e..8aac32498d4f 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -283,12 +283,8 @@ Variables:
             <Size>20f,20f</Size>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- Greyed out if no headphone device is configured -->
               <Template src="skin:pfl_cover.xml"/>
-
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 93f0b1237b17..9e92e34fbd6d 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -92,9 +92,6 @@ Description:
                 <SizePolicy>me,me</SizePolicy>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- translucent cover when Hot Cues are invisble -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
@@ -184,9 +181,6 @@ Description:
                     <Layout>stacked</Layout>
                     <Size>16f,15f</Size>
                     <Children>
-                      <!-- index 0 due to bug -->
-                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                       <!-- translucent cover when Stars don't fit into transport row -->
                       <WidgetGroup>
                         <ObjectName>SubmenuCover</ObjectName>
@@ -281,9 +275,6 @@ Description:
             <MaximumSize>-1,40</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Pitch slider is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -387,9 +378,6 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <WidgetGroup><!-- translucent cover when Spinny/Cover is disabled -->
                 <ObjectName>SubmenuCover</ObjectName>
                 <Layout>vertical</Layout>
@@ -532,9 +520,6 @@ Description:
             <MaximumSize>182,60</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Channel Mixer is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -563,9 +548,6 @@ Description:
                     <MaximumSize>182,20</MaximumSize>
                     <SizePolicy>me,me</SizePolicy>
                     <Children>
-                      <!-- index 0 due to bug -->
-                      <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                       <!-- translucent cover when EQ knobs are hidden -->
                       <WidgetGroup>
                         <ObjectName>SubmenuCover</ObjectName>
@@ -605,9 +587,6 @@ Description:
             <MaximumSize>182,20</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Channel Mixer is hidden -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -657,9 +636,6 @@ Description:
                 <Size>40f,20f</Size>
                 <Layout>stacked</Layout>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- translucent cover when Effects are invisible -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
@@ -702,9 +678,6 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>stacked</Layout>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
               <!-- translucent cover when Effects are invisble -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -765,9 +738,6 @@ Description:
                 <MaximumSize>112,20</MaximumSize>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
-                  <!-- index 0 due to bug -->
-                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
                   <!-- translucent cover when Samlers are hidden -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
diff --git a/res/skins/Tango/vinyl_controls_left.xml b/res/skins/Tango/vinyl_controls_left.xml
index 15ff78bdf041..bc4d2ad7e8c2 100644
--- a/res/skins/Tango/vinyl_controls_left.xml
+++ b/res/skins/Tango/vinyl_controls_left.xml
@@ -34,7 +34,6 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
               </Template>
-
               <Template src="skin:statuslight_4state.xml">
                 <SetVariable name="ObjectName">VinylControlStatus</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
@@ -79,14 +78,11 @@ Variables:
 
           <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- Cue mode button with translucent cover -->
+          <!-- Cue mode button. Active only if Vinyl mode is not RELATIVE -->
+          <WidgetGroup>
             <Layout>stacked</Layout>
             <Size>40f,21f</Size>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
-              <!-- Block mouse when Vinyl control is not in RELATIVE mode -->
               <WidgetGroup>
                 <TooltipId>vinylcontrol_cueing</TooltipId>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -98,7 +94,6 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <Template src="skin:button_3state_persist.xml">
                 <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
                 <SetVariable name="ObjectName">VinylModeButton</SetVariable>
@@ -109,7 +104,7 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup><!-- /Cue mode button with translucent covers -->
+          </WidgetGroup><!-- /Cue mode button -->
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/vinyl_controls_right.xml b/res/skins/Tango/vinyl_controls_right.xml
index ff883ec96269..320d8ce7848b 100644
--- a/res/skins/Tango/vinyl_controls_right.xml
+++ b/res/skins/Tango/vinyl_controls_right.xml
@@ -43,7 +43,6 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
               </Template>
-
               <Template src="skin:statuslight_4state.xml">
                 <SetVariable name="ObjectName">VinylControlStatus</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
@@ -88,14 +87,11 @@ Variables:
 
           <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
 
-          <WidgetGroup><!-- Cue mode button with translucent cover -->
+          <!-- Cue mode button. Active only if Vinyl mode is not RELATIVE -->
+          <WidgetGroup>
             <Layout>stacked</Layout>
             <Size>40f,21f</Size>
             <Children>
-              <!-- index 0 due to bug -->
-              <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
-              <!-- Block mouse when Vinyl control is not in RELATIVE mode -->
               <WidgetGroup>
                 <TooltipId>vinylcontrol_cueing</TooltipId>
                 <ObjectName>SubmenuCover</ObjectName>
@@ -107,7 +103,6 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-
               <Template src="skin:button_3state_persist.xml">
                 <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
                 <SetVariable name="ObjectName">VinylModeButton</SetVariable>
@@ -118,7 +113,7 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup><!-- /Cue mode button with translucent covers -->
+          </WidgetGroup><!-- /Cue mode button -->
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>