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

smaller EQ knobs without ring #6

Closed
wants to merge 1 commit into from
Closed

smaller EQ knobs without ring #6

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
8 changes: 7 additions & 1 deletion res/skins/Deere/deck_mixer_controls_col3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,23 @@

<!--In 2 deck mode, show the gain knob above the channel level meters.-->
<WidgetGroup>
<Layout>vertical</Layout>
<Layout>horizontal</Layout>
<Size>40f,-1</Size>
<MinimumSize>40,34</MinimumSize>
<MaximumSize>40,46</MaximumSize>
<Children>
<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>
<Template src="skin:knob_with_label.xml">
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="control">pregain</SetVariable>
<SetVariable name="color">red</SetVariable>
<SetVariable name="label">Gain</SetVariable>
</Template>
<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey>[Master],show_4decks</ConfigKey>
Expand Down
20 changes: 14 additions & 6 deletions res/skins/Deere/equalizer_rack_parameter_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,18 @@
</Children>
</WidgetGroup>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>

<SizeAwareStack>
<Size>40f,-1me</Size>
<Size>30f,-1me</Size>
<Children>

<WidgetGroup>
<ObjectName>EQKnobNoLabel</ObjectName>
<MinimumSize>40,34</MinimumSize>
<MaximumSize>40,41</MaximumSize>
<MinimumSize>30,30</MinimumSize>
<MaximumSize>30,36</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -86,8 +90,8 @@

<WidgetGroup>
<ObjectName>EQKnobWithLabel</ObjectName>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>40,45</MaximumSize>
<MinimumSize>30,37</MinimumSize>
<MaximumSize>30,40</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -96,7 +100,7 @@
<SetVariable name="color"><Variable name="color"/></SetVariable>
</Template>
<EffectParameterName>
<Size>40f,10f</Size>
<Size>30f,10f</Size>
<ObjectName>KnobLabel</ObjectName>
<EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
<EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
Expand All @@ -109,6 +113,10 @@
</Children>
</SizeAwareStack>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>

</Children>
<Connection>
<ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
Expand Down
20 changes: 14 additions & 6 deletions res/skins/Deere/equalizer_rack_parameter_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@
<Layout>horizontal</Layout>
<Children>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>

<SizeAwareStack>
<Size>40f,-1me</Size>
<Size>30f,-1me</Size>
<Children>

<WidgetGroup>
<ObjectName>EQKnobNoLabel</ObjectName>
<MinimumSize>40,34</MinimumSize>
<MaximumSize>40,41</MaximumSize>
<MinimumSize>30,30</MinimumSize>
<MaximumSize>30,36</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -38,8 +42,8 @@

<WidgetGroup>
<ObjectName>EQKnobWithLabel</ObjectName>
<MinimumSize>40,42</MinimumSize>
<MaximumSize>40,45</MaximumSize>
<MinimumSize>30,37</MinimumSize>
<MaximumSize>30,40</MaximumSize>
<Layout>vertical</Layout>
<Children>
<Template src="skin:knob.xml">
Expand All @@ -48,7 +52,7 @@
<SetVariable name="color"><Variable name="color"/></SetVariable>
</Template>
<EffectParameterName>
<Size>40f,10f</Size>
<Size>30f,10f</Size>
<ObjectName>KnobLabel</ObjectName>
<EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
<EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
Expand All @@ -61,6 +65,10 @@
</Children>
</SizeAwareStack>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>

<!--Wrap the EffectPushButton in a vertical WidgetGroup with spacers to ensure it stays in the
correct position when the knobs get further apart and closer together.-->
<WidgetGroup>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Template>
<KnobComposed>
<TooltipId><Variable name="TooltipId"/></TooltipId>
<Size>40f,34f</Size>
<Size>30f,30f</Size>
<Knob>knob_<Variable name="color"/>.svg</Knob>
<BackPath>knob_bg.svg</BackPath>
<MinAngle>-135</MinAngle>
Expand Down
35 changes: 22 additions & 13 deletions res/skins/Deere/knob_bg.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.
56 changes: 28 additions & 28 deletions res/skins/Deere/knob_blue.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.
40 changes: 22 additions & 18 deletions res/skins/Deere/knob_red.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.
2 changes: 1 addition & 1 deletion res/skins/Deere/knob_toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Children>
<KnobComposed>
<TooltipId><Variable name="TooltipId"/></TooltipId>
<Size>34f,28f</Size>
<Size>28f,28f</Size>
<Knob>knob_<Variable name="color"/>.svg</Knob>
<BackPath>knob_bg.svg</BackPath>
<MinAngle>-135</MinAngle>
Expand Down
4 changes: 4 additions & 0 deletions res/skins/Deere/knob_with_button_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
</Children>
</WidgetGroup>

<Template src="skin:spacer_hx.xml">
<SetVariable name="width">5</SetVariable>
</Template>

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

</Children>
Expand Down
Loading