Tango+LateNight: fix fx parameter name alignment

mixxxdj · Jan 10, 2023 · d639dad · d639dad
1 parent 6b5efff
commit d639dad
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 58 deletions.
diff --git a/res/skins/LateNight/fx/parameter_button.xml b/res/skins/LateNight/fx/parameter_button.xml
@@ -52,25 +52,16 @@
 
       <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>AlignBottom</ObjectName>
-        <Layout>horizontal</Layout>
+      <EffectButtonParameterName>
+        <ObjectName>FxButtonLabel</ObjectName>
         <SizePolicy>me,f</SizePolicy>
         <MinimumSize>40,10</MinimumSize>
         <MaximumSize>58,10</MaximumSize>
-        <Children>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-          <EffectButtonParameterName>
-            <ObjectName>FxButtonLabel</ObjectName>
-            <EffectUnitGroup><Variable name="FxUnitGroup"/></EffectUnitGroup>
-            <Effect><Variable name="FxNum"/></Effect>
-            <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
-            <Alignment>center</Alignment>
-          </EffectButtonParameterName>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
+        <EffectUnitGroup><Variable name="FxUnitGroup"/></EffectUnitGroup>
+        <Effect><Variable name="FxNum"/></Effect>
+        <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
+        <Alignment>center</Alignment>
+      </EffectButtonParameterName>
 
     </Children>
     <Connection>

diff --git a/res/skins/LateNight/fx/parameter_knob.xml b/res/skins/LateNight/fx/parameter_knob.xml
@@ -45,25 +45,17 @@
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>AlignBottom</ObjectName>
-        <Layout>horizontal</Layout>
+      <EffectParameterName>
+        <ObjectName>FxKnobLabel</ObjectName>
         <SizePolicy>me,f</SizePolicy>
         <MinimumSize>40,10</MinimumSize>
-        <MaximumSize>58,10</MaximumSize>
-        <Children>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-          <EffectParameterName>
-            <ObjectName>FxKnobLabel</ObjectName>
-            <EffectRack>1</EffectRack>
-            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
-            <Effect><Variable name="FxNum"/></Effect>
-            <EffectParameter><Variable name="FxParameter"/></EffectParameter>
-            <Alignment>center</Alignment>
-          </EffectParameterName>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
+        <MaximumSize>60,10</MaximumSize>
+        <EffectRack>1</EffectRack>
+        <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+        <Effect><Variable name="FxNum"/></Effect>
+        <EffectParameter><Variable name="FxParameter"/></EffectParameter>
+        <Elide>right</Elide>
+      </EffectParameterName>
 
       <WidgetGroup>
         <ObjectName>FxLinkButtons</ObjectName>

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -191,6 +191,7 @@ WSearchLineEdit::item:selected,
 #LatencyLabel {
   font-size: 10px;
   text-align: center;
+  qproperty-alignment: AlignCenter;
 }
 
 WPushButton,
@@ -285,13 +286,6 @@ WRecordingDuration {
   text-align: right;
 }
 
-#KnobLabel,
-#FxKnobLabel,
-#FxButtonLabel {
-  qproperty-alignment: 'AlignLeft | AlignVCenter';
-}
-
-
 WTrackTableViewHeader::item {
   /* Don't set a font size to pick up the system font size. */
   border-bottom: 1px solid #000;

diff --git a/res/skins/Tango/fx/parameter_knob.xml b/res/skins/Tango/fx/parameter_knob.xml
@@ -51,26 +51,17 @@ Variables:
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- Name of parameter -->
+          <EffectParameterName>
+            <ObjectName>FxParameterKnobName</ObjectName>
             <MinimumSize>42,12</MinimumSize>
             <MaximumSize>51,12</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <!-- To keep text centered it's in an container with spacers on the left/right -->
-              <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
-              <EffectParameterName>
-                <ObjectName>FxParameterKnobName</ObjectName>
-                <Size>-1min,12f</Size>
-                <EffectRack><Variable name="FxRack"/></EffectRack>
-                <EffectUnit><Variable name="FxUnit"/></EffectUnit>
-                <Effect><Variable name="FxNum"/></Effect>
-                <EffectParameter><Variable name="FxParameter"/></EffectParameter>
-                <Alignment>left</Alignment>
-              </EffectParameterName>
-              <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
-            </Children>
-          </WidgetGroup>
+            <EffectRack><Variable name="FxRack"/></EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <EffectParameter><Variable name="FxParameter"/></EffectParameter>
+            <Elide>right</Elide>
+          </EffectParameterName>
         </Children>
       </WidgetGroup><!-- Parameter knob + parameter name -->
 

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -1901,7 +1901,7 @@ decks, samplers, mic, aux, fx */
   margin-right: 1px;
 }
   #FxParameterKnobName {
-    qproperty-alignment: 'AlignLeft | AlignTop';
+    qproperty-alignment: 'AlignHCenter | AlignTop';
     font-size: 10px/10px;
     font-weight: bold;
     color: #999999;