Skip to content

Commit

Permalink
feat: add beatloop anchor to set and adjust loop from either start or…
Browse files Browse the repository at this point in the history
… end
  • Loading branch information
acolombier committed Feb 8, 2024
1 parent 7b3e485 commit a75206b
Show file tree
Hide file tree
Showing 13 changed files with 372 additions and 35 deletions.
50 changes: 50 additions & 0 deletions res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions res/skins/LateNight/controls/button_2state_persist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ Variables:
<Text><Variable name="state_0_text"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
<Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
</State>
<State>
<Number>1</Number>
<Text><Variable name="state_1_text"/></Text>
<Alignment><Variable name="Align"/></Alignment>
<Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
<Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
<Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
<Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
</State>
<Connection>
<ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
Expand Down
11 changes: 9 additions & 2 deletions res/skins/LateNight/decks/row_5_transportLoopJump.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<MinimumSize>78,52</MinimumSize>
<MaximumSize>86,52</MaximumSize>
<MaximumSize>104,52</MaximumSize>
<Children>
<WidgetGroup><!-- loop enable + beatloop size -->
<ObjectName>AlignLeftTop</ObjectName>
Expand All @@ -251,7 +251,7 @@
<ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
<SizePolicy>me,min</SizePolicy>
<MinimumSize>46,26</MinimumSize>
<MaximumSize>72,26</MaximumSize>
<MaximumSize>77,26</MaximumSize>
<Value><Variable name="Group"/>,beatloop_size</Value>
<!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
<Connection>
Expand Down Expand Up @@ -290,6 +290,13 @@
<SetVariable name="ConfigKey"><Variable name="Group"/>,loop_out</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_out_goto</SetVariable>
</Template>

<Template src="skins:LateNight/controls/button_2state_persist.xml">
<SetVariable name="TooltipId">loop_anchor</SetVariable>
<SetVariable name="ObjectName">LoopAnchor</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="Group"/>,loop_anchor</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Children>
Expand Down
67 changes: 67 additions & 0 deletions res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 67 additions & 0 deletions res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a75206b

Please sign in to comment.