Skip to content

WidgetGroup: add default index0 widget to stacked layout #2646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 3 commits into from
May 2, 2020
Merged

WidgetGroup: add default index0 widget to stacked layout #2646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
477997c
WidgetGroup: add default index0 widget to stacked layout
ronso0 Apr 10, 2020
15dcec9
remove stacked layout workarounds from skins
ronso0 Apr 10, 2020
1d2ddef
Merge branch 'master' into stacked-layout-fix
ronso0 May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions res/skins/LateNight/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
53 changes: 0 additions & 53 deletions res/skins/Tango (64 Samplers)/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,15 @@ 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 invisible -->
<ObjectName>SubmenuCover</ObjectName>
<Layout>vertical</Layout>
<Size>182f,13me</Size>
<Connection>
<ConfigKey persist="true">[Tango],hotcues</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<MinimumSize>182,13</MinimumSize>
<MaximumSize>182,20</MaximumSize>
Expand Down Expand Up @@ -183,21 +178,16 @@ 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>
<Layout>vertical</Layout>
<Size>16f,15f</Size>
<Connection>
<ConfigKey persist="true">[Tango],starrating_fits</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<Template src="skin:../Tango/button_2state_persist.xml">
<SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
<SetVariable name="Size">16f,15f</SetVariable>
Expand Down Expand Up @@ -279,13 +269,9 @@ 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>
<Layout>vertical</Layout>
<MinimumSize>182,26</MinimumSize>
<MaximumSize>-1,40</MaximumSize>
<SizePolicy>me,me</SizePolicy>
Expand All @@ -295,7 +281,6 @@ Description:
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>
<Size>182f,0me</Size>
Expand All @@ -305,7 +290,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>
Expand Down Expand Up @@ -385,20 +369,15 @@ 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>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey persist="true">[Tango],no_spinny_no_cover</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<!-- hint: enforced small cover/spinny with mixer -->
<WidgetGroup>
<ObjectName>SubmenuCover</ObjectName>
Expand Down Expand Up @@ -531,13 +510,9 @@ 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>
<Layout>vertical</Layout>
<MinimumSize>182,39</MinimumSize>
<MaximumSize>182,60</MaximumSize>
<SizePolicy>me,me</SizePolicy>
Expand All @@ -555,20 +530,15 @@ 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>
<Layout>vertical</Layout>
<MinimumSize>182,13</MinimumSize>
<MaximumSize>182,20</MaximumSize>
<SizePolicy>me,me</SizePolicy>
Expand All @@ -578,12 +548,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 -->

Expand All @@ -604,13 +572,9 @@ 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>
<Layout>vertical</Layout>
<MinimumSize>182,13</MinimumSize>
<MaximumSize>182,20</MaximumSize>
<SizePolicy>me,me</SizePolicy>
Expand All @@ -619,7 +583,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>
Expand Down Expand Up @@ -656,21 +619,16 @@ 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>
<Layout>vertical</Layout>
<Size>40f,20f</Size>
<Connection>
<ConfigKey persist="true">[EffectRack1],show</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<ObjectName>AlignVCenter</ObjectName>
<Size>40f,20f</Size>
Expand Down Expand Up @@ -701,21 +659,16 @@ 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 invisible -->
<WidgetGroup>
<ObjectName>SubmenuCover</ObjectName>
<Layout>vertical</Layout>
<Size>182f,13me</Size>
<Connection>
<ConfigKey persist="true">[EffectRack1],show</ConfigKey>
<Transform><Not/></Transform>
<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>
Expand Down Expand Up @@ -772,13 +725,9 @@ 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>
<Layout>vertical</Layout>
<MinimumSize>112,13</MinimumSize>
<MaximumSize>112,20</MaximumSize>
<SizePolicy>me,me</SizePolicy>
Expand All @@ -788,9 +737,7 @@ Description:
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<Template src="skin:skin_settings_sampler_rows_64.xml"/>

</Children>
</WidgetGroup><!-- /Sampler row buttons -->
</Children>
Expand Down
4 changes: 0 additions & 4 deletions res/skins/Tango/aux_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/deck_row_overview_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Variables:
<Template>
<WidgetGroup>
<ObjectName>Spacer0f</ObjectName>
<Layout>stacked</Layout>
<Layout>horizontal</Layout>
<SizePolicy>me,f</SizePolicy>
<Children>
<WidgetGroup>
Expand Down
4 changes: 0 additions & 4 deletions res/skins/Tango/fx_unit_left_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions res/skins/Tango/fx_unit_right_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
36 changes: 8 additions & 28 deletions res/skins/Tango/mic_aux_rack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading