Shade: center fx parameters below focused fx slot

4 files changed, 30 insertions, 9 deletions

diff --git a/res/skins/Shade/effect_parameter_button.xml b/res/skins/Shade/effect_parameter_button.xml
index ee17dc5c6d..7f3d183269 100644
--- a/res/skins/Shade/effect_parameter_button.xml
+++ b/res/skins/Shade/effect_parameter_button.xml
@@ -13,20 +13,21 @@
 		<ObjectName>EffectParameterButton</ObjectName>
 		<Layout>vertical</Layout>
 		<SizePolicy>me,f</SizePolicy>
-		<MinimumSize>-1,45</MinimumSize>
-		<MaximumSize>-1,45</MaximumSize> 
+		<MinimumSize>38,45</MinimumSize>
+		<MaximumSize>60,45</MaximumSize>
 		<Children>
 			<EffectButtonParameterName>
 			<Style>
-				WEffectButtonParameter { 
+				WEffectButtonParameter {
 					font: 10px/8px sans-serif;
 					font-family: "Open Sans";
-					background-color: transparent; 
-					color: #191F24; 
-					padding-left: 1px; 
+					background-color: transparent;
+					color: #191F24;
+					padding-left: 1px;
 				}
 				QLabel { qproperty-alignment: AlignCenter; }
 			</Style>
+      <Elide>right</Elide>
 			<ObjectName>ButtonLabel</ObjectName>
 			<EffectRack>1</EffectRack>
 			<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml
index b68740520b..e63846d171 100644
--- a/res/skins/Shade/effect_parameter_knob.xml
+++ b/res/skins/Shade/effect_parameter_knob.xml
@@ -13,7 +13,7 @@
 		<ObjectName>EffectParameterKnob</ObjectName>
 		<Layout>vertical</Layout>
 		<SizePolicy>me,f</SizePolicy>
-		<MinimumSize>-1,46</MinimumSize>
+		<MinimumSize>38,46</MinimumSize>
 		<MaximumSize>-1,46</MaximumSize>
 		<Children>
 			<EffectParameterName>
@@ -27,6 +27,9 @@
 					}
 					QLabel { qproperty-alignment: AlignCenter; }
 				</Style>
+        <Elide>right</Elide>
+        <SizePolicy>me,f</SizePolicy>
+        <MaximumSize>-1,46</MaximumSize>
 				<ObjectName>KnobLabel</ObjectName>
 				<EffectRack>1</EffectRack>
 				<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
diff --git a/res/skins/Shade/effect_parameters.xml b/res/skins/Shade/effect_parameters.xml
index 8992f4f569..977a7f48cd 100644
--- a/res/skins/Shade/effect_parameters.xml
+++ b/res/skins/Shade/effect_parameters.xml
@@ -1,7 +1,7 @@
 
 <Template>
   <WidgetGroup>
-    <Size>e,53f</Size>
+    <Size>-1min,53f</Size>
     <Layout>horizontal</Layout>
     <Style> WEffect, WPushButton {
       font: bold 12px/10px sans-serif;
diff --git a/res/skins/Shade/effectunit_parameters.xml b/res/skins/Shade/effectunit_parameters.xml
index 5b92fcc11a..dcbf54f90e 100644
--- a/res/skins/Shade/effectunit_parameters.xml
+++ b/res/skins/Shade/effectunit_parameters.xml
@@ -13,6 +13,15 @@
         <BackPath>style/style_bg_deck_pane.png</BackPath>
         <Layout>horizontal</Layout>
         <Children>
+          <!-- Spacer to position parameters more below the focused effect -->
+          <WidgetGroup>
+            <Size>0me,0min</Size>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
+              <Transform><IsEqual>1</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
           <Template src="skin:effect_parameters.xml">
             <SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
             <SetVariable name="effectnum">1</SetVariable>
@@ -25,6 +34,15 @@
             <SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
             <SetVariable name="effectnum">3</SetVariable>
           </Template>
+          <!-- Spacer to position parameters more below the focused effect -->
+          <WidgetGroup>
+            <Size>0me,0min</Size>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
+              <Transform><IsEqual>3</IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
         </Children>
       </WidgetGroup>
       <WidgetGroup>
@@ -44,4 +62,3 @@
       </Connection>
   </WidgetGroup>
 </Template>
-