From 46bed475225018bbe49585c5ac75f8505247b6a4 Mon Sep 17 00:00:00 2001
From: Howard-C <howardc@pku.edu.cn>
Date: Thu, 16 Apr 2020 23:14:03 +0800
Subject: [PATCH] Fix layout of fretboard diagram inspector

- Layout stretch of the main grid layout
- Size policies of several widgets
---
 mscore/inspector/inspector_fret.ui | 247 +++++++++++++++++------------
 1 file changed, 149 insertions(+), 98 deletions(-)

diff --git a/mscore/inspector/inspector_fret.ui b/mscore/inspector/inspector_fret.ui
index 05d92a1aad432..d7abe05aa608b 100644
--- a/mscore/inspector/inspector_fret.ui
+++ b/mscore/inspector/inspector_fret.ui
@@ -17,9 +17,6 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetNoConstraint</enum>
-   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -34,12 +31,6 @@
    </property>
    <item>
     <widget class="QFrame" name="frame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
@@ -75,7 +66,7 @@
        <verstretch>10</verstretch>
       </sizepolicy>
      </property>
-     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="1,0,0">
+     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0">
       <property name="leftMargin">
        <number>3</number>
       </property>
@@ -91,35 +82,60 @@
       <property name="spacing">
        <number>3</number>
       </property>
-      <item row="12" column="0" colspan="3">
-       <widget class="Ms::FretCanvas" name="diagram">
+      <item row="3" column="2">
+       <widget class="Ms::ResetButton" name="resetFrets" native="true">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
-          <verstretch>10</verstretch>
+          <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>50</width>
-          <height>250</height>
-         </size>
-        </property>
-        <property name="mouseTracking">
-         <bool>true</bool>
+        <property name="accessibleName">
+         <string>Reset 'Frets' value</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QSpinBox" name="frets">
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="strings">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="accessibleName">
-         <string>Frets</string>
+         <string>Strings</string>
         </property>
         <property name="minimum">
          <number>1</number>
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="mag">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="accessibleName">
+         <string>Scale</string>
+        </property>
+        <property name="minimum">
+         <double>0.200000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>50.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.200000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -130,18 +146,24 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_6">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Fret number:</string>
+         <string>Strings:</string>
         </property>
         <property name="buddy">
-         <cstring>fretNumber</cstring>
+         <cstring>strings</cstring>
         </property>
        </widget>
       </item>
       <item row="5" column="2">
        <widget class="Ms::ResetButton" name="resetFretNumber" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="accessibleName">
          <string>Reset 'Fret number' value</string>
         </property>
@@ -149,43 +171,54 @@
       </item>
       <item row="1" column="2">
        <widget class="Ms::ResetButton" name="resetPlacement" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="accessibleName">
          <string>Reset 'Placement' value</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="strings">
+      <item row="12" column="0" colspan="3">
+       <widget class="Ms::FretCanvas" name="diagram">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
+          <verstretch>10</verstretch>
          </sizepolicy>
         </property>
-        <property name="accessibleName">
-         <string>Strings</string>
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>250</height>
+         </size>
         </property>
-        <property name="minimum">
-         <number>1</number>
+        <property name="mouseTracking">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <widget class="Ms::ResetButton" name="resetFrets" native="true">
-        <property name="accessibleName">
-         <string>Reset 'Frets' value</string>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Fret number:</string>
         </property>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="Ms::ResetButton" name="resetShowNut" native="true">
-        <property name="accessibleName">
-         <string>Reset 'Show nut' value</string>
+        <property name="buddy">
+         <cstring>fretNumber</cstring>
         </property>
        </widget>
       </item>
       <item row="6" column="0" colspan="2">
        <widget class="QCheckBox" name="showNut">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
          <string>Show nut</string>
         </property>
@@ -194,23 +227,61 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Placement:</string>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="fretNumber">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="buddy">
-         <cstring>placement</cstring>
+        <property name="accessibleName">
+         <string>Fret number</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Frets:</string>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="frets">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="buddy">
-         <cstring>frets</cstring>
+        <property name="accessibleName">
+         <string>Frets</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="2">
+       <widget class="Ms::ResetButton" name="resetShowNut" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Show nut' value</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="Ms::ResetButton" name="resetMag" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="accessibleName">
+         <string>Reset 'Scale' value</string>
         </property>
        </widget>
       </item>
@@ -225,6 +296,9 @@
         <property name="accessibleName">
          <string>Placement</string>
         </property>
+        <property name="frame">
+         <bool>true</bool>
+        </property>
         <item>
          <property name="text">
           <string>Above</string>
@@ -237,59 +311,36 @@
         </item>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Strings:</string>
+         <string>Placement:</string>
+        </property>
+        <property name="buddy">
+         <cstring>placement</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="Ms::ResetButton" name="resetStrings" native="true">
-        <property name="accessibleName">
-         <string>Reset 'Strings' value</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QSpinBox" name="fretNumber">
-        <property name="accessibleName">
-         <string>Fret number</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="Ms::ResetButton" name="resetMag" native="true">
-        <property name="accessibleName">
-         <string>Reset 'Scale' value</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QDoubleSpinBox" name="mag">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="accessibleName">
-         <string>Scale</string>
-        </property>
-        <property name="minimum">
-         <double>0.200000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>50.000000000000000</double>
+         <string>Reset 'Strings' value</string>
         </property>
-        <property name="singleStep">
-         <double>0.200000000000000</double>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Frets:</string>
         </property>
-        <property name="value">
-         <double>1.000000000000000</double>
+        <property name="buddy">
+         <cstring>frets</cstring>
         </property>
        </widget>
       </item>