Skip to content

Tango :: scaling fixes for sliders #2317

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

Closed
ronso0 wants to merge 1 commit into from
Closed

Tango :: scaling fixes for sliders #2317

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
5 changes: 3 additions & 2 deletions res/skins/Tango/mixer_channel_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions res/skins/Tango/mixer_channel_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions res/skins/Tango/mixer_headphone.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ Description:
<SliderComposed>
<TooltipId>headMix</TooltipId>
<ObjectName>MixerbarSlider</ObjectName>
<SizePolicy>min,min</SizePolicy>
<Handle>knobs_sliders/headMix_handle.svg</Handle>
<Slider>knobs_sliders/headMix_scale.svg</Slider>
<Size>50f,24f</Size>
<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>
Expand Down
6 changes: 3 additions & 3 deletions res/skins/Tango/mixer_master.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,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>50f,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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/rate_pitch_key.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Tango/sampler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/spinny_cover_maxi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,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>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/spinny_cover_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Variables:
<TooltipId>coverart</TooltipId>
<Size>40me,40me</Size>
<Group>[Channel<Variable name="chanNum"/>]</Group>
<DefaultCover>skin:/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
<DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
<Connection>
<ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
<BindProperty>visible</BindProperty>
Expand Down
8 changes: 2 additions & 6 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,12 +1233,8 @@ WBeatSpinBox,
font-weight: bold;
text-align: center;
padding-top: 1px;
}
#BpmLabel {
background-color: #252525;
}
#BpmLabelMini {
background-color: #252525;
background-color: #252525;
border-radius: 2px;
}
#SyncButtonOverlay[displayValue="0"]:hover,
#SyncButtonOverlayMini[displayValue="0"]:hover {
Expand Down
5 changes: 3 additions & 2 deletions res/skins/Tango/topbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ Description:
<Children>
<SliderComposed>
<TooltipId>crossfader</TooltipId>
<Handle>knobs_sliders/crossfader_handle.svg</Handle>
<Slider>knobs_sliders/crossfader_scale.svg</Slider>
<Size>108f,28f</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>
Expand Down