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.

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

PaleMoon contrast, SVG optimize, small fixes #3835

Merged
merged 6 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 29 additions & 30 deletions res/skins/LateNight/decks/rate_controls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,54 @@
<SizePolicy>min,me</SizePolicy>
<Children>

<WidgetGroup><!-- BPM + rate -->
<WidgetGroup><!-- BPM + rate + Tap overlay-->
<ObjectName>BpmRateTapContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MaximumSize>,46</MaximumSize>
<Children>
<WidgetGroup><!-- BpmContainer + Tap overlay -->
<ObjectName>AlignCenter</ObjectName>
<WidgetGroup>
<ObjectName>BpmTapContainer</ObjectName>
<Layout>stacked</Layout>
<Size>56f,22f</Size>
<Size>57f,-1me</Size>
<Children>
<!-- In order to make the bpm display tappable, we use an old-style
widget group and put the bpm pushbutton on top of the display. -->
<PushButton>
<TooltipId>bpm_tap_visual_bpm</TooltipId>
<ObjectName>BpmTap</ObjectName>
<Size>56f,22f</Size>
<Size>57f,-1me</Size>
<NumberStates>1</NumberStates>
<State>
<Number>0</Number>
</State>
<State>
<Number>1</Number>
</State>
<Connection>
<ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
</Connection>
</PushButton>
<NumberBpm>
<ObjectName>BpmText</ObjectName>
<TooltipId>visual_bpm</TooltipId>
<Size>56f,22f</Size>
<Channel><Variable name="ChanNum" /></Channel>
<NumberOfDigits>2</NumberOfDigits>
<Connection>
<ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
</Connection>
</NumberBpm>
<WidgetGroup><!-- BPM + rate -->
<ObjectName>AlignCenter</ObjectName>
<Layout>vertical</Layout>
<Size>57f,-1me</Size>
<Children>
<Number>
<ObjectName>BpmText</ObjectName>
<TooltipId>visual_bpm</TooltipId>
<Size>57f,22f</Size>
<NumberOfDigits>2</NumberOfDigits>
<Connection>
<ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
</Connection>
</Number>
<NumberRate>
<TooltipId>rate_display</TooltipId>
<ObjectName>RateText</ObjectName>
<Channel><Variable name="ChanNum" /></Channel>
<NumberOfDigits>2</NumberOfDigits>
</NumberRate>
</Children>
</WidgetGroup>
</Children>
</WidgetGroup><!-- BpmContainer + Tap overlay -->

<NumberRate>
<TooltipId>rate_display</TooltipId>
<ObjectName>RateText</ObjectName>
<Channel><Variable name="ChanNum" /></Channel>
<NumberOfDigits>2</NumberOfDigits>
</NumberRate>
</WidgetGroup>
</Children>
</WidgetGroup><!-- BPM + rate -->
</WidgetGroup><!-- BpmRateTapContainer -->

<WidgetGroup>
<ObjectName>SyncBox</ObjectName>
Expand Down
27 changes: 9 additions & 18 deletions res/skins/LateNight/decks/rate_controls_compact.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
</WidgetGroup>

<WidgetGroup>
<ObjectName>RateContainerCompact</ObjectName>
<ObjectName>BpmRateTapContainer</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>

<WidgetGroup><!-- BPM + rate -->
<ObjectName>BpmRateTapContainer</ObjectName>
<WidgetGroup><!-- BPM + rate + Tap overlay-->
<ObjectName>BpmTapContainer</ObjectName>
<Layout>stacked</Layout>
<Size>60f,42f</Size>
<Children>
Expand All @@ -30,36 +30,27 @@
<PushButton>
<TooltipId>bpm_tap_visual_bpm</TooltipId>
<ObjectName>BpmTap</ObjectName>
<!-- substract parent margin & padding -->
<Size>57f,40f</Size>
<SizePolicy>me,me</SizePolicy>
<NumberStates>1</NumberStates>
<State>
<Number>0</Number>
</State>
<State>
<Number>1</Number>
</State>
<Connection>
<ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
</Connection>
</PushButton>
<WidgetGroup><!-- BpmContainer + Tap overlay -->
<WidgetGroup><!-- BPM + rate -->
<ObjectName>AlignCenter</ObjectName>
<Layout>vertical</Layout>
<Size>60f,39f</Size>
<SizePolicy>me,me</SizePolicy>
<Children>
<NumberBpm>
<Number>
<ObjectName>BpmText</ObjectName>
<TooltipId>visual_bpm</TooltipId>
<Size>60f,22f</Size>
<Channel><Variable name="ChanNum" /></Channel>
<Size>-1me,22f</Size>
<NumberOfDigits>2</NumberOfDigits>
<Connection>
<ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
</Connection>
</NumberBpm>

</Number>
<NumberRate>
<TooltipId>rate_display</TooltipId>
<ObjectName>RateText</ObjectName>
Expand Down
17 changes: 0 additions & 17 deletions res/skins/LateNight/palemoon/knobs/knob_bg_fx.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 2 additions & 53 deletions res/skins/LateNight/palemoon/knobs/knob_bg_master.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 2 additions & 38 deletions res/skins/LateNight/palemoon/knobs/knob_bg_regular.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 2 additions & 19 deletions res/skins/LateNight/palemoon/knobs/knob_bg_small.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.