push fx units 4px apart, fix/improve spacer template

daschuer · Oct 15, 2017 · 1fbe07d · 1fbe07d
1 parent 6eee1d4
commit 1fbe07d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
@@ -37,6 +37,11 @@ Container for all the effect units
                     <SetVariable name="EffectUnit">1</SetVariable>
                   </Template>
 
+                  <Template src="skin:spacer_hx.xml">
+                    <SetVariable name="width">4</SetVariable>
+                    <SetVariable name="color">22</SetVariable>
+                  </Template>
+
                   <Template src="skin:effect_unit.xml">
                     <SetVariable name="EffectRack">1</SetVariable>
                     <SetVariable name="EffectUnit">2</SetVariable>
@@ -56,6 +61,11 @@ Container for all the effect units
                     <SetVariable name="EffectUnit">3</SetVariable>
                   </Template>
 
+                  <Template src="skin:spacer_hx.xml">
+                    <SetVariable name="width">4</SetVariable>
+                    <SetVariable name="color">22</SetVariable>
+                  </Template>
+
                   <Template src="skin:effect_unit.xml">
                     <SetVariable name="EffectRack">1</SetVariable>
                     <SetVariable name="EffectUnit">4</SetVariable>

diff --git a/res/skins/Deere/mixer_controls_condensed_left.xml b/res/skins/Deere/mixer_controls_condensed_left.xml
@@ -133,7 +133,7 @@
             <Children>
 
               <Template src="skin:spacer_vx.xml">
-                <SetVariable name="width">2</SetVariable>
+                <SetVariable name="height">2</SetVariable>
               </Template>
 
               <Template src="skin:crossfader_orientation_button.xml">

diff --git a/res/skins/Deere/mixer_controls_condensed_right.xml b/res/skins/Deere/mixer_controls_condensed_right.xml
@@ -134,7 +134,7 @@
             <Children>
 
               <Template src="skin:spacer_vx.xml">
-                <SetVariable name="width">2</SetVariable>
+                <SetVariable name="height">2</SetVariable>
               </Template>
 
               <Template src="skin:crossfader_orientation_button.xml">

diff --git a/res/skins/Deere/spacer_hx.xml b/res/skins/Deere/spacer_hx.xml
@@ -4,12 +4,12 @@ Description: Spacer.
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>Spacer</ObjectName>
+    <ObjectName>Spacer<Variable name="color"/></ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Size><Variable name="width"/></Size>
-    <MinimumSize><Variable name="width"/></MinimumSize>
-    <MaximumSize><Variable name="width"/></MaximumSize>
+    <MinimumSize><Variable name="width"/>,-1</MinimumSize>
+    <MaximumSize><Variable name="width"/>,-1</MaximumSize>
     <Children>
     </Children>
   </WidgetGroup>

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -115,6 +115,10 @@
   border-width: 1px 0px;
 }
 
+#Spacer22 {
+  background-color: #222222;
+}
+
 #SamplerRow1,
 #SamplerRow2,
 #SamplerRow3,