From c748400cd30b702ba368ff20fffde869e8178015 Mon Sep 17 00:00:00 2001
From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com>
Date: Thu, 15 May 2025 14:22:10 -0400
Subject: [PATCH] Improved UI spacing consistency between languages

---
 qt/py/ui_MainMenu.py           | 13 +++++++++----
 qt/py/ui_WrapCheckboxWidget.py | 15 ++++++++-------
 qt/ui/MainMenu.ui              | 29 ++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/qt/py/ui_MainMenu.py b/qt/py/ui_MainMenu.py
index d9600f8..e2a4915 100644
--- a/qt/py/ui_MainMenu.py
+++ b/qt/py/ui_MainMenu.py
@@ -227,11 +227,11 @@ class Ui_MainWindow(object):
 
         self.verticalLayout_7.addWidget(self.patch_ios_checkbox)
 
-        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.verticalSpacer_2 = QSpacerItem(20, 200, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
 
         self.verticalLayout_7.addItem(self.verticalSpacer_2)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
+        self.horizontalSpacer = QSpacerItem(300, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum)
 
         self.verticalLayout_7.addItem(self.horizontalSpacer)
 
@@ -262,6 +262,11 @@ class Ui_MainWindow(object):
 
         self.auto_update_checkbox = WrapCheckboxWidget(self.centralwidget)
         self.auto_update_checkbox.setObjectName(u"auto_update_checkbox")
+        sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
+        sizePolicy4.setHorizontalStretch(0)
+        sizePolicy4.setVerticalStretch(0)
+        sizePolicy4.setHeightForWidth(self.auto_update_checkbox.sizePolicy().hasHeightForWidth())
+        self.auto_update_checkbox.setSizePolicy(sizePolicy4)
 
         self.verticalLayout_8.addWidget(self.auto_update_checkbox)
 
@@ -287,11 +292,11 @@ class Ui_MainWindow(object):
 
         self.verticalLayout_8.addLayout(self.custom_out_dir_entry_row)
 
-        self.verticalSpacer = QSpacerItem(20, 100, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 200, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
 
         self.verticalLayout_8.addItem(self.verticalSpacer)
 
-        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
+        self.horizontalSpacer_2 = QSpacerItem(300, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum)
 
         self.verticalLayout_8.addItem(self.horizontalSpacer_2)
 
diff --git a/qt/py/ui_WrapCheckboxWidget.py b/qt/py/ui_WrapCheckboxWidget.py
index ec82a8f..528d9b4 100644
--- a/qt/py/ui_WrapCheckboxWidget.py
+++ b/qt/py/ui_WrapCheckboxWidget.py
@@ -1,23 +1,24 @@
-from PySide6.QtCore import Qt, QSize
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QCheckBox, QHBoxLayout, QLabel, QWidget, QSizePolicy, QLayout
 
 class WrapCheckboxWidget(QWidget):
     def __init__(self, text, parent=None):
         super().__init__(parent)
         self.setAttribute(Qt.WA_StyledBackground, True)
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.MinimumExpanding)
+        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Maximum)
 
         self.checkbox = QCheckBox("")
-        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed)
-        sizePolicy1.setHorizontalStretch(0)
-        sizePolicy1.setVerticalStretch(0)
-        sizePolicy1.setHeightForWidth(self.checkbox.sizePolicy().hasHeightForWidth())
-        self.checkbox.setSizePolicy(sizePolicy1)
+        size_policy = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed)
+        size_policy.setHorizontalStretch(0)
+        size_policy.setVerticalStretch(0)
+        size_policy.setHeightForWidth(self.checkbox.sizePolicy().hasHeightForWidth())
+        self.checkbox.setSizePolicy(size_policy)
 
         self.label = QLabel(text)
         self.label.setAlignment(Qt.AlignVCenter | Qt.AlignLeft)
         self.label.setWordWrap(True)
         self.label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        self.label.setContentsMargins(0, 0, 0, 0)
 
         layout = QHBoxLayout(self)
         layout.setContentsMargins(5, 5, 5, 5)
diff --git a/qt/ui/MainMenu.ui b/qt/ui/MainMenu.ui
index 7ae2af6..bf613a5 100755
--- a/qt/ui/MainMenu.ui
+++ b/qt/ui/MainMenu.ui
@@ -277,12 +277,12 @@
              <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::Expanding</enum>
+             <enum>QSizePolicy::Policy::Preferred</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
-              <height>40</height>
+              <height>200</height>
              </size>
             </property>
            </spacer>
@@ -293,12 +293,12 @@
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>40</width>
-              <height>20</height>
+              <width>300</width>
+              <height>0</height>
              </size>
             </property>
            </spacer>
@@ -345,7 +345,14 @@
            </widget>
           </item>
           <item>
-           <widget class="WrapCheckboxWidget" name="auto_update_checkbox" native="true"/>
+           <widget class="WrapCheckboxWidget" name="auto_update_checkbox" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="WrapCheckboxWidget" name="custom_out_dir_checkbox" native="true"/>
@@ -380,12 +387,12 @@
              <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::Expanding</enum>
+             <enum>QSizePolicy::Policy::Preferred</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
-              <height>100</height>
+              <height>200</height>
              </size>
             </property>
            </spacer>
@@ -396,12 +403,12 @@
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>40</width>
-              <height>20</height>
+              <width>300</width>
+              <height>0</height>
              </size>
             </property>
            </spacer>