From f58aee7c359a489fa8370fcae82a7d226c0f4690 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 9 Feb 2017 19:37:12 +0100
Subject: [PATCH] rearrage Pitch section to save v-space for Pitch fader

---
 res/skins/Deere/deck_inner_column.xml | 74 +++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/res/skins/Deere/deck_inner_column.xml b/res/skins/Deere/deck_inner_column.xml
index 545b6a509db0..40bf8daf4faf 100644
--- a/res/skins/Deere/deck_inner_column.xml
+++ b/res/skins/Deere/deck_inner_column.xml
@@ -17,8 +17,8 @@
           <Template src="skin:left_2state_button.xml">
             <SetVariable name="TooltipId">sync_enabled</SetVariable>
             <SetVariable name="ObjectName">DeckSync</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">-1,18</SetVariable>
+            <SetVariable name="MaximumSize">-1,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text">Sync</SetVariable>
             <SetVariable name="state_0_pressed"></SetVariable>
@@ -38,36 +38,6 @@
         </Connection>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <SliderComposed>
-            <TooltipId>rate</TooltipId>
-            <Size>40f,-1me</Size>
-            <MaximumSize>40,200</MaximumSize>
-            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-            <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
-            </Connection>
-          </SliderComposed>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>RateDisplay<Variable name="i"/></ObjectName>
-        <Layout>vertical</Layout>
-        <Children>
-          <NumberRate>
-            <TooltipId>rate_display</TooltipId>
-            <Channel>
-                <Variable name="i"/>
-            </Channel>
-            <NumberOfDigits>2</NumberOfDigits>
-          </NumberRate>
-        </Children>
-      </WidgetGroup>
-
       <WidgetGroup>
         <ObjectName>RateTempButtons</ObjectName>
         <Layout>horizontal</Layout>
@@ -75,8 +45,8 @@
           <Template src="skin:left_right_1state_button.xml">
             <SetVariable name="ObjectName">TempRateDown</SetVariable>
             <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">22,18</SetVariable>
+            <SetVariable name="MaximumSize">22,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text"></SetVariable>
             <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
@@ -88,8 +58,8 @@
           <Template src="skin:left_right_1state_button.xml">
             <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
             <SetVariable name="ObjectName">TempRateUp</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="MinimumSize">22,18</SetVariable>
+            <SetVariable name="MaximumSize">22,18</SetVariable>
             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text"></SetVariable>
             <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
@@ -100,11 +70,41 @@
         </Children>
       </WidgetGroup>
 
+      <WidgetGroup>
+        <ObjectName>RateDisplay<Variable name="i"/></ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <NumberRate>
+            <TooltipId>rate_display</TooltipId>
+            <Channel>
+                <Variable name="i"/>
+            </Channel>
+            <NumberOfDigits>2</NumberOfDigits>
+          </NumberRate>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SliderComposed>
+            <TooltipId>rate</TooltipId>
+            <Size>40f,-1me</Size>
+            <MaximumSize>40,200</MaximumSize>
+            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+            </Connection>
+          </SliderComposed>
+        </Children>
+      </WidgetGroup>
+
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
           <Template src="skin:spacer_vx.xml">
-            <SetVariable name="height">8</SetVariable>
+            <SetVariable name="height">2</SetVariable>
           </Template>
 
           <Template src="skin:left_right_display_2state_button.xml">