优化标题栏控件大小和位置

Author: AMagicPear

Plain_Craft_Launcher_2/Controls/RoundShadow.py

@@ -10,7 +10,7 @@ class RoundShadow(QWidget):
 
     def __init__(self):
         super().__init__()
-        self.border_width = setup.corner_radius # 从设置中获取圆角值
+        self.border_width = setup.CORNER_RADIUS # 从设置中获取圆角值
         # 设置 窗口无边框和背景透明 *必须
         self.setAttribute(Qt.WA_TranslucentBackground)
         # 修改窗口标志，添加系统菜单和最小化按钮标志

Plain_Craft_Launcher_2/FormMain.py

@@ -12,6 +12,7 @@
 
 from FormMain_ui import Ui_FormMain
 from Controls.RoundShadow import RoundShadow
+from Modules.Base.ModSetup import mod_setup
 
 
 class FormMain(RoundShadow):
@@ -32,7 +33,7 @@ def __init__(self):
 
         # 窗口加载第一步：基础
         # 设置窗口大小
-        self.resize(850, 500)
+        self.resize(*mod_setup.SIZE)
         self.logger.write("窗口加载第一步完成", LT.INFO)
 
         # 窗口加载第二步：加载 UI 控件
@@ -94,9 +95,9 @@ def resizeEvent(self, a0: QResizeEvent):
         self.container.setGeometry(9, 9, self.width() - 18, self.height() - 18)
 
         # 更新面板大小
-        self.ui.PanTitle.setGeometry(0, 0, self.container.width(), 40)
+        self.ui.PanTitle.setGeometry(0, 0, self.container.width(), mod_setup.TITLE_BAR_H)
         self.ui.PanMain.setGeometry(
-            0, 40, self.container.width(), self.container.height() - 40
+            0, mod_setup.TITLE_BAR_H, self.container.width(), self.container.height() - mod_setup.TITLE_BAR_H
         )
 
     def close_window(self):

Plain_Craft_Launcher_2/FormMain_ui.py

@@ -16,9 +16,9 @@ class Ui_FormMain(object):
 
     def setupUi(self, FormMain: QtWidgets.QWidget):
         # 获取所有需要的设置项
-        size = setup.size
+        size = setup.SIZE
 
-        corner_radius = setup.corner_radius
+        corner_radius = setup.CORNER_RADIUS
         bg_color = setup.color_brush_5
         fg_color = setup.color_brush_2
 
@@ -34,8 +34,8 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
 
         # 标题栏 Panel
         self.PanTitle = QtWidgets.QFrame(FormMain)
-        self.PanTitle.setGeometry(QtCore.QRect(0, 0, size[0], 48))
-        self.PanTitle.setBaseSize(QtCore.QSize(size[0], 48))
+        self.PanTitle.setGeometry(QtCore.QRect(0, 0, size[0], setup.TITLE_BAR_H))
+        self.PanTitle.setBaseSize(QtCore.QSize(size[0], setup.TITLE_BAR_H))
         self.PanTitle.setStyleSheet(
             f"""
             QFrame#PanTitle {{
@@ -52,7 +52,7 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
 
         # 主 Panel
         self.PanMain = QtWidgets.QFrame(FormMain)
-        self.PanMain.setGeometry(QtCore.QRect(0, 48, size[0], (size[1] - 48)))
+        self.PanMain.setGeometry(QtCore.QRect(0, setup.TITLE_BAR_H, size[0], (size[1] - 48)))
         self.PanMain.setStyleSheet(
             f"""
             QFrame#PanMain {{
@@ -75,20 +75,20 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
             tooltip="Exit",
             padding=(7, 7, -10, -10),
         )
-        self.BtnExit.setGeometry(QtCore.QRect((size[0] - 50), 12, 13, 13))
+        self.BtnExit.setGeometry(QtCore.QRect((size[0] - 50), 15, 14, 14))
         self.BtnExit.setObjectName("BtnExit")
 
         # 标题栏按钮 -- 最小化
         self.BtnMin = QtWidgets.QPushButton(self.PanTitle)
-        self.BtnMin.setGeometry(QtCore.QRect((size[0] - 100), 0, 40, 40))
+        self.BtnMin.setGeometry(QtCore.QRect((size[0] - 98), 2, 40, 40))
         self.BtnMin.setStyleSheet("background-color: transparent;")
         self.BtnMin.setText("—")
         self.BtnMin.setObjectName("BtnMin")
 
         # 标题栏标签 -- 标题
         self.SVGTitle = QSvgWidget(self.PanTitle)
         self.SVGTitle.load("Images/svgtitle.svg")
-        self.SVGTitle.setGeometry(QtCore.QRect(0, 4, 120, 40))
+        self.SVGTitle.setGeometry(QtCore.QRect(2, 14, 76, 24))
         self.SVGTitle.setStyleSheet("background-color: transparent;")
         self.SVGTitle.setObjectName("SVGTitle")
 

Plain_Craft_Launcher_2/Modules/Base/ModSetup.py

@@ -6,6 +6,10 @@
 
 class ModSetup:
     """写入/读取设置相关的类"""
+    # 常量（不随主题变化）
+    CORNER_RADIUS = 8
+    SIZE: tuple[int, int] = (850, 500)
+    TITLE_BAR_H: int = 48
 
     def __init__(self):
         self.logger = ModLogging(module_name="ModSetup")
@@ -14,18 +18,16 @@ def __init__(self):
 
     def setup_settings(self):
         """初始化设置项"""
-        self.ColorBrush1 = "#343d4a"
+        self.color_brush_1 = "#343d4a"
         self.color_brush_2 = "#0F6FCD"
-        self.ColorBrush3 = "#1370f3"
-        self.ColorBrush4 = "#4890f5"
+        self.color_brush_3 = "#1370f3"
+        self.color_brush_4 = "#4890f5"
         self.color_brush_5 = "#96c0f9"
-        self.ColorBrush6 = "#d5e6fd"
-        self.ColorBrush7 = "#e0eafd"
-        self.ColorBrush8 = "#eaf2fe"
-        self.ColorBrushBg0 = "#96c0f9"
-        self.ColorBrushBg1 = "#bee0eafd"
-        self.corner_radius = 8
-        self.size = (850, 500)
+        self.color_brush_6 = "#d5e6fd"
+        self.color_brush_7 = "#e0eafd"
+        self.color_brush_8 = "#eaf2fe"
+        self.color_brush_bg_0 = "#96c0f9"
+        self.color_brush_bg_1 = "#bee0eafd"
 
         self.logger.write("设置初始化完成", LT.INFO)
 
@@ -51,4 +53,4 @@ def save_settings(self, file_path: str = "./data/Config.json"):
         self.logger.write("设置文件保存成功", LT.INFO)
 
 
-mod_setup = ModSetup()
+mod_setup = ModSetup()