Skip to content
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

Jump to bottom

Tango: remove VU peak indicators from stacked layout #11430

Merged
merged 1 commit into from
Apr 3, 2023
+151 −66
Merged

Tango: remove VU peak indicators from stacked layout #11430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed res/skins/Tango/graphics/vumeter_clipping.png
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion res/skins/Tango/graphics/vumeter_clipping.svg
View file
Open in desktop

This file was deleted.

Binary file removed res/skins/Tango/graphics/vumeter_clipping_over.png
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion res/skins/Tango/graphics/vumeter_clipping_over.svg
View file
Open in desktop

This file was deleted.

Binary file modified res/skins/Tango/graphics/vumeter_level.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 57 additions & 1 deletion res/skins/Tango/graphics/vumeter_level.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/skins/Tango/graphics/vumeter_level_over.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 62 additions & 1 deletion res/skins/Tango/graphics/vumeter_level_over.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/Tango/graphics/vumeter_mini_clipping.png
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions res/skins/Tango/graphics/vumeter_mini_clipping.svg
View file
Open in desktop

This file was deleted.

Binary file modified res/skins/Tango/graphics/vumeter_mini_clipping_over.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions res/skins/Tango/graphics/vumeter_mini_clipping_over.svg
View file
Open in desktop

This file was deleted.

Binary file modified res/skins/Tango/graphics/vumeter_mini_level.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions res/skins/Tango/graphics/vumeter_mini_level.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion res/skins/Tango/mic_aux_sampler/aux_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/mic_aux_sampler/mic_unit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/mic_aux_sampler/sampler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions res/skins/Tango/mixer/vumeter_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading