From 1119d1f969ea8847d043a4ec1271b1e860ad8f26 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 5 Nov 2019 00:21:01 +0100
Subject: [PATCH 1/2] Skins: minimize Fx link invert button, put it next to
 link button

---
 ...ameter.xml => effect_parameter_button.xml} |   0
 res/skins/Deere/effect_parameter_knob.xml     |  53 +++------
 .../effect_single_with_parameters_row.xml     |  16 +--
 res/skins/Deere/style.qss                     |  11 +-
 res/skins/LateNight/fx_parameter_button.xml   |   2 +-
 res/skins/LateNight/fx_parameter_knob.xml     |  41 ++++---
 res/skins/LateNight/style.qss                 |  25 ++--
 .../btn_link_type/btn_link_inversion_off.png  | Bin 0 -> 150 bytes
 .../btn_link_type/btn_link_inversion_on.png   | Bin 0 -> 150 bytes
 .../btn_link_type/btn_link_type_inverted.png  | Bin 146 -> 0 bytes
 .../btn_link_type/btn_link_type_left.png      | Bin 155 -> 156 bytes
 .../btn_link_type_left_right.png              | Bin 162 -> 161 bytes
 .../btn_link_type/btn_link_type_linked.png    | Bin 146 -> 151 bytes
 .../btn_link_type/btn_link_type_none.png      | Bin 146 -> 151 bytes
 .../btn_link_type/btn_link_type_right.png     | Bin 154 -> 156 bytes
 res/skins/Shade/effect_parameter_knob.xml     | 109 ++++++++++--------
 res/skins/Tango/fx_parameter_knob.xml         |  66 +++++++----
 res/skins/Tango/fx_parameter_row.xml          |   2 +-
 res/skins/Tango/fx_unit_left.xml              |   6 +-
 res/skins/Tango/style.qss                     |  12 +-
 20 files changed, 180 insertions(+), 163 deletions(-)
 rename res/skins/Deere/{effect_button_parameter.xml => effect_parameter_button.xml} (100%)
 create mode 100644 res/skins/Shade/btn_link_type/btn_link_inversion_off.png
 create mode 100644 res/skins/Shade/btn_link_type/btn_link_inversion_on.png
 delete mode 100644 res/skins/Shade/btn_link_type/btn_link_type_inverted.png

diff --git a/res/skins/Deere/effect_button_parameter.xml b/res/skins/Deere/effect_parameter_button.xml
similarity index 100%
rename from res/skins/Deere/effect_button_parameter.xml
rename to res/skins/Deere/effect_parameter_button.xml
diff --git a/res/skins/Deere/effect_parameter_knob.xml b/res/skins/Deere/effect_parameter_knob.xml
index 36bbc9ae404c..d5406098f2f6 100644
--- a/res/skins/Deere/effect_parameter_knob.xml
+++ b/res/skins/Deere/effect_parameter_knob.xml
@@ -11,7 +11,7 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <MinimumSize>34,42</MinimumSize>
+    <MinimumSize>34,</MinimumSize>
     <MaximumSize>58,42</MaximumSize>
     <SizePolicy>me,f</SizePolicy>
     <Children>
@@ -45,51 +45,30 @@
         <Elide>right</Elide>
       </EffectParameterName>
 
-      <Template src="skin:left_5state_button.xml">
-        <!-- Button has no text/images, qss only -->
-        <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
-        <SetVariable name="ObjectName">EffectSlotParameterLinkTypeButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SmallHorizontalStretchLinkButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SmallHorizontalStretchLinkButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SmallHorizontalStretchLinkButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text"></SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="state_2_text"></SetVariable>
-        <SetVariable name="state_2_pressed"></SetVariable>
-        <SetVariable name="state_2_unpressed"></SetVariable>
-        <SetVariable name="state_3_text"></SetVariable>
-        <SetVariable name="state_3_pressed"></SetVariable>
-        <SetVariable name="state_3_unpressed"></SetVariable>
-        <SetVariable name="state_4_text"></SetVariable>
-        <SetVariable name="state_4_pressed"></SetVariable>
-        <SetVariable name="state_4_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_type</SetVariable>
-      </Template>
-
       <WidgetGroup>
-        <ObjectName>EffectSlotParameterLinkInversionButtonContainer</ObjectName>
-        <Layout>vertical</Layout>
+        <ObjectName>EffectSlotParameterLinkButtonsContainer</ObjectName>
+        <Layout>horizontal</Layout>
         <Size>-1,6f</Size>
         <Children>
           <Template src="skin:left_2state_button.xml">
             <!-- Button has no text/images, qss only -->
             <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
             <SetVariable name="ObjectName">EffectSlotParameterLinkInversionButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SmallHorizontalStretchLinkButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SmallHorizontalStretchLinkButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SmallHorizontalStretchLinkButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text"></SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="MinimumSize">6,4</SetVariable>
+            <SetVariable name="MaximumSize">10,4</SetVariable>
+            <SetVariable name="SizePolicy">me,f</SetVariable>
             <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_inverse</SetVariable>
           </Template>
+
+          <Template src="skin:left_5state_button.xml">
+            <!-- Button has no text/images, qss only -->
+            <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
+            <SetVariable name="ObjectName">EffectSlotParameterLinkTypeButton</SetVariable>
+            <SetVariable name="MinimumSize">30,4</SetVariable>
+            <SetVariable name="MaximumSize">46,4</SetVariable>
+            <SetVariable name="SizePolicy">me,f</SetVariable>
+            <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_type</SetVariable>
+          </Template>
         </Children>
       </WidgetGroup>
 
diff --git a/res/skins/Deere/effect_single_with_parameters_row.xml b/res/skins/Deere/effect_single_with_parameters_row.xml
index dee9f0ab240c..a393c4a3c778 100644
--- a/res/skins/Deere/effect_single_with_parameters_row.xml
+++ b/res/skins/Deere/effect_single_with_parameters_row.xml
@@ -73,28 +73,28 @@ Variables:
                 <SetVariable name="EffectParameter">8</SetVariable>
               </Template>
 
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">1</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">2</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">3</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">4</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">5</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">6</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">7</SetVariable>
               </Template>
-              <Template src="skin:effect_button_parameter.xml">
+              <Template src="skin:effect_parameter_button.xml">
                 <SetVariable name="EffectButtonParameter">8</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 0613c145a461..b31e10594e28 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1812,8 +1812,11 @@ do not highlight either state. */
   standard button definitions.
   Note: EQ Gain effects cannot be used in split mode (= can be 0 or 1 only)
 */
-#EffectSlotParameterLinkTypeButton {
-    margin: 0 4px 0 4px;
+#EffectSlotParameterLinkButtonsContainer {
+    margin: 1px 4px;
+    qproperty-layoutSpacing: 1;
+    border-radius: 2px;
+    background-color: #282828;
 }
 
 #EffectSlotParameterLinkTypeButton[value="2"] {
@@ -1896,10 +1899,6 @@ do not highlight either state. */
     border: 0px solid #0080BE;
 }
 
-#EffectSlotParameterLinkInversionButton {
-    margin: 0px 4px 0px 4px;
-}
-
 #EffectSlotParameterLinkInversionButton[value="1"] {
     background-color: #b90505;
 }
diff --git a/res/skins/LateNight/fx_parameter_button.xml b/res/skins/LateNight/fx_parameter_button.xml
index ca2f7b7de61a..8584b868037b 100644
--- a/res/skins/LateNight/fx_parameter_button.xml
+++ b/res/skins/LateNight/fx_parameter_button.xml
@@ -21,7 +21,7 @@
       <WidgetGroup>
         <ObjectName>FxButton</ObjectName>
         <Layout>horizontal</Layout>
-        <Size>40me,25f</Size>
+        <Size>40me,18f</Size>
         <Children>
           <Template src="skin:fx_button.xml">
             <SetVariable name="icon">fx_parameter</SetVariable>
diff --git a/res/skins/LateNight/fx_parameter_knob.xml b/res/skins/LateNight/fx_parameter_knob.xml
index 1959188b739f..6feb1865aef3 100644
--- a/res/skins/LateNight/fx_parameter_knob.xml
+++ b/res/skins/LateNight/fx_parameter_knob.xml
@@ -14,7 +14,7 @@
   <WidgetGroup>
     <ObjectName>FxKnobContainer</ObjectName>
     <Layout>vertical</Layout>
-    <MinimumSize>55,35</MinimumSize>
+    <MinimumSize>40,35</MinimumSize>
     <MaximumSize>60,</MaximumSize>
     <SizePolicy>me,me</SizePolicy>
     <Children>
@@ -61,23 +61,32 @@
 
       <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
-      <!-- Meta knob link button -->
-      <Template src="skin:button_5state.xml">
-        <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
-        <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
-        <SetVariable name="Size">55me,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <ObjectName>AlignHCenter</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+          <!-- Meta knob link invert button -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
+            <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
+            <SetVariable name="Size">10f,5f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
+          </Template>
 
-      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+          <!-- Meta knob link button -->
+          <Template src="skin:button_5state.xml">
+            <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
+            <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
+            <SetVariable name="Size">33,5f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
+          </Template>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
 
-      <!-- Meta knob link invert button -->
-      <Template src="skin:button_2state.xml">
-        <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
-        <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
-        <SetVariable name="Size">55me,7f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
-      </Template>
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index dc25bc2aac40..5df07279c389 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1465,7 +1465,6 @@ WBeatSpinBox,
 
 #FxButton {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  padding-top: 4px;
 }
 
 #FxUnitKnob {
@@ -1550,10 +1549,10 @@ WEffectSelector {
   border-radius: 1px;
   }
   #FxSuperLinkButton {
-    margin: 0px 5px 0px 5px;
-  }
+    margin: 0px 2px 0px 1px;
+    }
   #FxSuperLinkInvertButton {
-    margin: 0px 5px 2px 5px;
+    margin: 0px;
   }
 
 #FxSuperLinkButton[value="0"],
@@ -1572,7 +1571,7 @@ WEffectSelector {
   }
 
 #FxSuperLinkButton[value="1"] {
-  background-color: #A5A5A5;
+  background-color: #5b9601;
   }
   #FxSuperLinkButton[value="1"]:hover {
     background-color: #CDCDCD;
@@ -1580,8 +1579,8 @@ WEffectSelector {
 #FxSuperLinkButton[value="2"] {	/*
   a simple way to achieve a partitioning in thirds	*/
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-    stop: 0 #A5A5A5,
-    stop: 0.33 #A5A5A5,
+    stop: 0 #5b9601,
+    stop: 0.33 #5b9601,
     stop: 0.34 #4b4b4b,
     stop: 1 #4b4b4b);
   }
@@ -1596,8 +1595,8 @@ WEffectSelector {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
     stop: 0 #4b4b4b,
     stop: 0.66 #4b4b4b,
-    stop: 0.67 #A5A5A5,
-    stop: 1 #A5A5A5);
+    stop: 0.67 #5b9601,
+    stop: 1 #5b9601);
   }
   #FxSuperLinkButton[value="3"]:hover {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
@@ -1608,12 +1607,12 @@ WEffectSelector {
     }
 #FxSuperLinkButton[value="4"] {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-    stop: 0 #A5A5A5,
-    stop: 0.330000 #A5A5A5,
+    stop: 0 #5b9601,
+    stop: 0.330000 #5b9601,
     stop: 0.340000 #4b4b4b,
     stop: 0.660000 #4b4b4b,
-    stop: 0.670000 #A5A5A5,
-    stop: 1 #A5A5A5);
+    stop: 0.670000 #5b9601,
+    stop: 1 #5b9601);
   }
   #FxSuperLinkButton[value="4"]:hover {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
diff --git a/res/skins/Shade/btn_link_type/btn_link_inversion_off.png b/res/skins/Shade/btn_link_type/btn_link_inversion_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf7f89d748f9f9b56a8de49485cd2f561aa2cce4
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^AT}!p8<4C?sm%aVY)RhkE(~uNTp5(Mht1Ceif|Tq
zL>4nJa0`PlBg3pY5<o%r5>H=O_QzcE{Kh;l{68H63MqTKIEHXsPfkz}GB7eQFi?5A
q{r~ah8TXEOxv3@jszfPXWMFXNWMNAbaB%@DXYh3Ob6Mw<&;$VdsUv;>

literal 0
HcmV?d00001

diff --git a/res/skins/Shade/btn_link_type/btn_link_inversion_on.png b/res/skins/Shade/btn_link_type/btn_link_inversion_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..51d797bde539f94eb3b5b7b3cf703b25ec194658
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^AT}!p8<4C?sm%aVY)RhkE(~uNTp5(Mht1Ceif|Tq
zL>4nJa0`PlBg3pY5<o%r5>H=O_QzcE{6-cR9+;Z}g_J#A978y+CnqQf85kKD82k|}
q_|fk#__>|A$LGi_k1bA%7#W;avasFF{&@|koWax8&t;ucLK6V>r6q>|

literal 0
HcmV?d00001

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_inverted.png b/res/skins/Shade/btn_link_type/btn_link_type_inverted.png
deleted file mode 100644
index 9eaad96e940e0c9dbf2f04f644600934820546ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8hdeLkBKP=rC=)5S4F<9u?0#FB=IB1h|4W&Q;x
hNq%l;?%`S7;083OlZ8pPZC5Qwt*5J>%Q~loCIAjUBZL3|

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_left.png b/res/skins/Shade/btn_link_type/btn_link_type_left.png
index 42ca246e61393a2d53aa0c213153045ea015a3fe..97761f1525965f981448cc5703c5d8c0e6090309 100644
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W_!3HE<na>ylDYhhUcNc~?46Y1H+r#GP0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBj+Ed43~n&zEUEKp{;}7sn8Z%gG4~j1p235)vvN
xulh27g45n;9~R!~Zy)%Sg}26flrpd6W0-oCjqPYv-vXc}22WQ%mvv4FO#lQ>D5(Gd

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8hxRBKuLQJ|29r;B5V#`)v~i6spaMULjjO#SzG
t^89aY6BCbF-*L06u4tc_C~|>=f#FUC2h(SEPAQ-s22WQ%mvv4FO#oLoD~<pF

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_left_right.png b/res/skins/Shade/btn_link_type/btn_link_type_left_right.png
index 1e61a581fd16fbaebd055277bb9a41702ed0fd57..4f39fa6de922fd3edf564526d3089c2d0704e6b5 100644
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W_!3HE<na>ylDYhhUcNc~?46Y1H+r#GP0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBj+Ed46Li{_ppX0)_NET^vIsE+;1}FiJ>CNJyx7
zyy}bm>?QYf)z-|?Tlx2}mfoh{a>~M6V?9clSMo6&%VB3b=wH4NsFT6d)z4*}Q$iB}
D95pMt

literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8iMQ+>~?(?B78PZ!4!jq}L~5=$B;iX6?4nfh;W
zw{P{~69$iEml;Yr{g>S25-_#<&A#I&47f5_7~UmvF->^+f*+`r!PC{xWt~$(69CdE
BFjxQp

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_linked.png b/res/skins/Shade/btn_link_type/btn_link_type_linked.png
index 2b1feff5d14e86732b7246fc99e1f070a4155e03..cfa1b4b30650e5b470d7961d6e7062c55ef9abb6 100644
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W_!3HE<na>ylDYhhUcNc~?46Y1H+r#GP0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBj+Ed46M-XH%*^0EJXMT^vIsE+;1}FiJ>CNJyx7
syz0w*skY8H`;MP*$rTT}>#&NMq1m5>t?9*@8$k68p00i_>zopr0E00o<^TWy

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8htyMJ|j7Enmu)5S4F<9u?0#FB=IB1iLMrv3{~
int9?~bq~+t1~;H)P8O!p;{|;{r3{{~elF{r5}E*zV<wvb

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_none.png b/res/skins/Shade/btn_link_type/btn_link_type_none.png
index f72adc211ea8f8dcd7ce3d5041f0a6c0c66010a0..03b25ffff0e0c97d1946f3502488c5129d8183e9 100644
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W_!3HE<na>ylDYhhUcNc~?46Y1H+r#GP0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBj+Ed46Lyj#<)ofI=#sE{-7*my;6~7$u}6BqVs8
s%Kz`rd-$2}nv|49+qhTeDO_b_XxYxf=Hw$@0#wi7>FVdQ&MBb@0QEX02><{9

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8hZQNdneGf+t0)5S4F<9u?0#FB=IB1b)czWuMc
kG3VY9FSoWp2W18Z9#0mgIXf*AfJzxWUHx3vIVCg!0B2eyxBvhE

diff --git a/res/skins/Shade/btn_link_type/btn_link_type_right.png b/res/skins/Shade/btn_link_type/btn_link_type_right.png
index 953cca85e00ff79699add74d6c371d92598bbef0..13a5a30d255833c90afe1625722a77fb7a4e1d23 100644
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W_!3HE<na>ylDYhhUcNc~?46Y1H+r#GP0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBj+Ed46Ng8LDi)Kp{;}7sn8Z%gG4~j1p235)vj%
x3jgWv@lbVZJqxe!&D#EnowxLs>}m{QXQ({J%H|y7SqRj`;OXk;vd$@?2>_mICcgjx

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^YCz1w!3HEBMfy$#Qfx`y?k)`fL2$v|<scEx0*}aI
z1_o|n5N2eUHAey{$X?><>&pI!ol8hp{M)>iY@m?3r;B5V#`)v~i6spaMUDo2()$1L
sWID&+^b<k{*Se&9w{>d^bWmnsxL3@^BwNBC3e>{j>FVdQ&MBb@04<*?%K!iX

diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml
index 55c2c717bcff..2c5c64c5b472 100644
--- a/res/skins/Shade/effect_parameter_knob.xml
+++ b/res/skins/Shade/effect_parameter_knob.xml
@@ -49,58 +49,65 @@
 							</EffectParameterKnob>
 						</Children>
 					</WidgetGroup>
-					<PushButton>
-						<TooltipId>EffectSlot_parameter_link_type</TooltipId>
-						<NumberStates>5</NumberStates>
-						<State>
-							<Number>0</Number>
-							<Pressed>skin:/btn/btn_link_type/btn_link_type_none.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_none.png</Unpressed>
-						</State>
-						<State>
-							<Number>1</Number>
-							<Pressed>skin:/btn/btn_link_type/btn_link_type_linked.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_linked.png</Unpressed>
-						</State>
-				   		<State>
-							<Number>2</Number>
-							<Pressed>skin:/btn/btn_link_type/btn_link_type_left.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_left.png</Unpressed>
-						</State>
-						<State>
-				  			<Number>3</Number>
-				  			<Pressed>skin:/btn/btn_link_type/btn_link_type_right.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_right.png</Unpressed>
-						</State>
-				   		<State>
-				  			<Number>4</Number>
-				  			<Pressed>skin:/btn/btn_link_type/btn_link_type_left_right.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_left_right.png</Unpressed>
-						</State>
-						<Connection>
-							<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_type</ConfigKey>
-				  			<ButtonState>LeftButton</ButtonState>
-						</Connection>
-					</PushButton>
 
-					<PushButton>
-						<TooltipId>EffectSlot_parameter_inversion</TooltipId>
-						<NumberStates>2</NumberStates>
-						<State>
-							<Number>0</Number>
-							<Pressed>skin:/btn/btn_link_type/btn_link_type_none.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_none.png</Unpressed>
-						</State>
-						<State>
-							<Number>1</Number>
-							<Pressed>skin:/btn/btn_link_type/btn_link_type_inverted.png</Pressed>
-							<Unpressed>skin:/btn/btn_link_type/btn_link_type_inverted.png</Unpressed>
-						</State>
-						<Connection>
-							<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_inverse</ConfigKey>
-							<ButtonState>LeftButton</ButtonState>
-						</Connection>
-					</PushButton>
+					<WidgetGroup>
+						<Layout>horizontal</Layout>
+						<Children>
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+					    <PushButton>
+						    <TooltipId>EffectSlot_parameter_inversion</TooltipId>
+						    <NumberStates>2</NumberStates>
+						    <State>
+							    <Number>0</Number>
+							    <Pressed>skin:/btn_link_type/btn_link_inversion_off.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_inversion_off.png</Unpressed>
+						    </State>
+						    <State>
+							    <Number>1</Number>
+							    <Pressed>skin:/btn_link_type/btn_link_inversion_on.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_inversion_on.png</Unpressed>
+						    </State>
+						    <Connection>
+							    <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_inverse</ConfigKey>
+							    <ButtonState>LeftButton</ButtonState>
+						    </Connection>
+					    </PushButton>
+					    <PushButton>
+						    <TooltipId>EffectSlot_parameter_link_type</TooltipId>
+						    <NumberStates>5</NumberStates>
+						    <State>
+							    <Number>0</Number>
+							    <Pressed>skin:/btn_link_type/btn_link_type_none.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_type_none.png</Unpressed>
+						    </State>
+						    <State>
+							    <Number>1</Number>
+							    <Pressed>skin:/btn_link_type/btn_link_type_linked.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_type_linked.png</Unpressed>
+						    </State>
+				       		<State>
+							    <Number>2</Number>
+							    <Pressed>skin:/btn_link_type/btn_link_type_left.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_type_left.png</Unpressed>
+						    </State>
+						    <State>
+				      			<Number>3</Number>
+				      			<Pressed>skin:/btn_link_type/btn_link_type_right.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_type_right.png</Unpressed>
+						    </State>
+				       		<State>
+				      			<Number>4</Number>
+				      			<Pressed>skin:/btn_link_type/btn_link_type_left_right.png</Pressed>
+							    <Unpressed>skin:/btn_link_type/btn_link_type_left_right.png</Unpressed>
+						    </State>
+						    <Connection>
+							    <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_type</ConfigKey>
+				      			<ButtonState>LeftButton</ButtonState>
+						    </Connection>
+					    </PushButton>
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+						</Children>
+					</WidgetGroup>
 				</Children>
 			</WidgetGroup>
 
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx_parameter_knob.xml
index 519b81510f3a..6171d3ab1d8c 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx_parameter_knob.xml
@@ -13,16 +13,18 @@ Variables:
   <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <MinimumSize>43,47</MinimumSize>
-    <MaximumSize>52,47</MaximumSize>
-    <SizePolicy>me,f</SizePolicy>
+    <MinimumSize>43,</MinimumSize>
+    <MaximumSize>52,</MaximumSize>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
 
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
       <WidgetGroup><!-- Parameter knob + parameter name -->
         <Layout>vertical</Layout>
-        <MinimumSize>42,33</MinimumSize>
-        <MaximumSize>51,33</MaximumSize>
-        <SizePolicy>me,f</SizePolicy>
+        <MinimumSize>42,</MinimumSize>
+        <MaximumSize>51,</MaximumSize>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
 
           <WidgetGroup><!-- Effect parameter knob -->
@@ -47,8 +49,8 @@ Variables:
           </WidgetGroup>
 
           <WidgetGroup><!-- Name of parameter -->
-            <MinimumSize>42,11</MinimumSize>
-            <MaximumSize>51,11</MaximumSize>
+            <MinimumSize>42,12</MinimumSize>
+            <MaximumSize>51,12</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
@@ -69,23 +71,39 @@ Variables:
         </Children>
       </WidgetGroup><!-- Parameter knob + parameter name -->
 
-      <!-- Meta knob link button -->
-      <Template src="skin:button_5state.xml">
-        <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
-        <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
-        <SetVariable name="Size">42me,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
-      </Template>
-
-      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>AlignHCenter</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>FxSuperLinkButtonBox</ObjectName>
+            <Layout>horizontal</Layout>
+            <MinimumSize>39,</MinimumSize>
+            <MaximumSize>51,</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <!-- Meta knob link invert button -->
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
+                <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
+                <SetVariable name="Size">10f,5f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
+              </Template>
 
-      <!-- Meta knob link invert button -->
-      <Template src="skin:button_2state.xml">
-        <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
-        <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
-        <SetVariable name="Size">42me,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
-      </Template>
+              <!-- Meta knob link button -->
+              <Template src="skin:button_5state.xml">
+                <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
+                <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
+                <SetVariable name="Size">25me,5f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
 
       <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 0b64a08ec93d..43136fbfd966 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -9,7 +9,7 @@ Variables passed through from fx_unit:
   <WidgetGroup>
     <ObjectName>FxParameters<Variable name="Side"/></ObjectName>
     <Layout>horizontal</Layout>
-    <Size>min,47f</Size>
+    <Size>min,min</Size>
     <Children>
 
       <Template src="skin:fx_parameter_knob.xml">
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index 9fdb9d7da6a9..50b7ca8a6ee3 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -187,7 +187,7 @@ Variables:
       <WidgetGroup><!-- FxUnitControls -->
         <ObjectName>FxUnitControls</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <WidgetGroup><!-- FX label + FX expand button -->
             <ObjectName>AlignCenter</ObjectName>
@@ -201,7 +201,7 @@ Variables:
                 <Alignment>right</Alignment>
               </Label>
 
-              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
               <Template src="skin:button_2state_persist.xml">
                 <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
@@ -255,7 +255,7 @@ Variables:
                       <Template src="skin:knob_textless.xml">
                         <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                         <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
-                        <SetVariable name="Size">30f,30f</SetVariable>
+                        <SetVariable name="Size">30f,26f</SetVariable>
                         <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                         <SetVariable name="ConfigKey">super1</SetVariable>
                         <SetVariable name="Color">blue</SetVariable>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 02b1f9efa3b5..29b05ff432f3 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1801,14 +1801,20 @@ decks, samplers, mic, aux, fx */
     #FxParameterButtonName_active {
       color: #eeeeee;
     }
-
+#FxSuperLinkButtonBox,
 #FxSuperLinkButton,
 #FxSuperLinkInvertButton {
   /* those buttons are only 5px tall, that's why they won't accept
   3px radius which is set for all WPushButtons */
   border-radius: 2px;
-  margin-right: 1px;
-}
+  }
+  #FxSuperLinkButtonBox {
+    background-color: #282828;
+    margin: 0px 2px 0px 1px;
+    qproperty-layoutSpacing: 1;
+  }
+  #FxSuperLinkInvertButton {
+  }
 
 #FxSuperLinkButton[value="0"],
 #FxSuperLinkInvertButton[displayValue="0"] {

From 19bdc46959bb644f94d42fe2d9cc370531edf633 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 6 Nov 2019 20:27:27 +0100
Subject: [PATCH 2/2] LateNight: increase Fx link invert / Fx link button
 spacing

---
 res/skins/LateNight/fx_parameter_knob.xml | 2 +-
 res/skins/LateNight/style.qss             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/LateNight/fx_parameter_knob.xml b/res/skins/LateNight/fx_parameter_knob.xml
index 6feb1865aef3..4a4eb7e68426 100644
--- a/res/skins/LateNight/fx_parameter_knob.xml
+++ b/res/skins/LateNight/fx_parameter_knob.xml
@@ -71,7 +71,7 @@
           <Template src="skin:button_2state.xml">
             <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
             <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
-            <SetVariable name="Size">10f,5f</SetVariable>
+            <SetVariable name="Size">9f,5f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
           </Template>
 
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 5df07279c389..dab638c9926f 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1549,7 +1549,7 @@ WEffectSelector {
   border-radius: 1px;
   }
   #FxSuperLinkButton {
-    margin: 0px 2px 0px 1px;
+    margin: 0px 2px 0px 2px;
     }
   #FxSuperLinkInvertButton {
     margin: 0px;