Merge pull request #13242 from ronso0/tango-rate-range-labels

Tango/Qt6: fix rate range label position
mixxxdj · May 20, 2024 · 87c4e65 · 87c4e65
2 parents 72e7735 + c664dce
commit 87c4e65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/res/skins/Tango/decks/rate_pitch_key.xml b/res/skins/Tango/decks/rate_pitch_key.xml
@@ -185,7 +185,7 @@ Variables:
                 <Size>50f,-1me</Size>
                 <Children>
                   <WidgetGroup>
-                    <SizePolicy>me,me</SizePolicy>
+                    <SizePolicy>me,min</SizePolicy>
                     <Layout>horizontal</Layout>
                     <Children>
                       <!-- Top range limit + prefix -->
@@ -195,21 +195,23 @@ Variables:
                         <Channel><Variable name="chanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>prefix</Display>
-                        <SizePolicy>me,me</SizePolicy>
+                        <SizePolicy>me,min</SizePolicy>
                       </RateRange>
                       <RateRange>
                         <TooltipId>rate_range_display</TooltipId>
                         <ObjectName>RateDisplayTopRate</ObjectName>
                         <Channel><Variable name="chanNum" /></Channel>
                         <Position>Top</Position>
                         <Display>range</Display>
-                        <SizePolicy>me,me</SizePolicy>
+                        <SizePolicy>min,min</SizePolicy>
                       </RateRange>
                     </Children>
                   </WidgetGroup><!-- Pitch range indicators -->
 
+                  <WidgetGroup><Size>0min,1me</Size></WidgetGroup>
+
                   <WidgetGroup>
-                    <SizePolicy>me,me</SizePolicy>
+                    <SizePolicy>me,min</SizePolicy>
                     <Layout>horizontal</Layout>
                     <Children>
                       <!-- Bottom range limit + prefix -->
@@ -220,15 +222,15 @@ Variables:
                         <Position>Bottom</Position>
                         <Align>Bottom</Align>
                         <Display>prefix</Display>
-                        <SizePolicy>me,me</SizePolicy>
+                        <SizePolicy>me,min</SizePolicy>
                       </RateRange>
                       <RateRange>
                         <TooltipId>rate_range_display</TooltipId>
                         <ObjectName>RateDisplayBottomRate</ObjectName>
                         <Channel><Variable name="chanNum" /></Channel>
                         <Align>Bottom</Align>
                         <Display>range</Display>
-                        <SizePolicy>me,me</SizePolicy>
+                        <SizePolicy>min,min</SizePolicy>
                       </RateRange>
                     </Children>
                   </WidgetGroup><!-- Pitch range indicators -->

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -3200,11 +3200,8 @@ WRateRange {
 }
 
 #RateDisplayTopPrefix,
-#RateDisplayTopRate {
-    qproperty-alignment: 'AlignHCenter | AlignTop';
-}
-
 #RateDisplayBottomPrefix,
+#RateDisplayTopRate,
 #RateDisplayBottomRate {
-    qproperty-alignment: 'AlignHCenter | AlignBottom';
+    qproperty-alignment: 'AlignHCenter';
 }