fix mixer cut-off & knob label cut-off

ronso0 · Jan 26, 2017 · 2658161 · 2658161
1 parent 787b70e
commit 2658161
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 34 deletions.
diff --git a/res/skins/Deere/deck_mixer_controls_col1_left.xml b/res/skins/Deere/deck_mixer_controls_col1_left.xml
@@ -64,5 +64,9 @@
       </Template>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col1_right.xml b/res/skins/Deere/deck_mixer_controls_col1_right.xml
@@ -64,5 +64,9 @@
       </Template>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/left_deck_mixer_controls.xml b/res/skins/Deere/left_deck_mixer_controls.xml
@@ -14,19 +14,16 @@
       <!-- In 2 deck mode, we show a 3-column mixer section -->
       <WidgetGroup>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:deck_mixer_controls_col1_left.xml"/>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
             </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
-          <Template src="skin:deck_mixer_controls_col3.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -41,16 +38,7 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:deck_mixer_controls_col1_left.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerLeft</ObjectName>

diff --git a/res/skins/Deere/right_deck_mixer_controls.xml b/res/skins/Deere/right_deck_mixer_controls.xml
@@ -15,18 +15,14 @@
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:deck_mixer_controls_col3.xml"/>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:deck_mixer_controls_col1_right.xml"/>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
             </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -41,16 +37,7 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:deck_mixer_controls_col1_right.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_eqs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerRight</ObjectName>

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -823,6 +823,7 @@ WWidget, QLabel {
   border: none;
   qproperty-alignment: 'AlignHCenter';
   font: 10px;
+  margin-top: -2px;
 }
 
 #SmallKnobLabel {