fix(FormMain_ui): fix #9

refactor(ModPage, FormMain_ui):  把自编的页面切换逻辑改成原生的 QStackedWidget

Author: CreeperIsASpy

Plain_Craft_Launcher_2/FormMain.py

@@ -93,9 +93,7 @@ def resizeEvent(self, a0: QResizeEvent):
         self.ui.PanTitle.setGeometry(0, 0, self.container.width(), title_height)
         self.ui.PanMain.setGeometry(0, title_height, self.container.width(), self.container.height() - title_height)
 
-        # 更新PageLaunch大小并确保它在最上层
-        self.ui.page.setGeometry(0, 0, self.ui.PanMain.width(), self.ui.PanMain.height())
-        self.ui.page.raise_()
+        # 不需要单独更新页面大小，QStackedWidget 会自动调整子组件大小
 
     def close_window(self):
         """处理窗口关闭（对应的信号：BtnExit.clicked）"""

Plain_Craft_Launcher_2/FormMain_ui.py

@@ -52,18 +52,16 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
         self.PanTitle.setObjectName("PanTitle")
 
         # 主 Panel
-        self.PanMain = QtWidgets.QFrame(FormMain)
+        self.PanMain = QtWidgets.QStackedWidget(FormMain)
         self.PanMain.setGeometry(QtCore.QRect(0, title_height, size[0], (size[1] - title_height)))
         self.PanMain.setStyleSheet(f"""
-            QFrame#PanMain {{
+            QStackedWidget#PanMain {{
                 background-color: qlineargradient(spread:pad, x1:0.9, y1:0.1, x2:0, y2:1, 
                                               stop:0 {setup.get_settings('ColorBrush5')}, stop:1 {setup.get_settings('ColorBrush6')});
                 border-bottom-left-radius: {corner_radius}px;
                 border-bottom-right-radius: {corner_radius}px;
             }}
         """)
-        self.PanMain.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.PanMain.setFrameShadow(QtWidgets.QFrame.Plain)
         self.PanMain.setObjectName("PanMain")
 
         # 标题栏按钮 -- 退出
@@ -77,9 +75,9 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
         self.BtnMin.setObjectName("BtnMin")
 
         # 标题栏按钮 -- 切换到下载页面
+        # 标题栏按钮 -- 切换到启动页面
         self.BtnPageLaunch = MyIconTextButton(self.PanTitle, svg_path="Images/BtnTitlePageLaunch.svg",
-                                              text="Launch",
-                                              command=lambda: self.page_manager.switch_page(self.PanMain, 0))
+                                              text="Launch", command=lambda: self.page_manager.switch_page(self.PanMain, 0))
         self.BtnPageLaunch.setGeometry(QtCore.QRect(500, 8, 0, 0))                                
         self.BtnPageLaunch.setObjectName("BtnPageDownload")
 
@@ -90,10 +88,18 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
         self.SVGTitle.setStyleSheet("background-color: transparent;")
         self.SVGTitle.setObjectName("SVGTitle")
 
-        self.page = PageLaunch(self.PanMain)
-        self.page.setGeometry(QtCore.QRect(0, 0, size[0], (size[1] - title_height)))
-        self.page.setObjectName("PageLaunch")
-        self.page.raise_()
+        # 添加页面到 QStackedWidget
+        self.page_launch = PageLaunch()
+        self.PanMain.addWidget(self.page_launch)
+        
+        # 如果有 PageDownload，也添加进来
+        from Pages.PageDownload.PageDownload import PageDownload
+        self.page_download = PageDownload()
+        self.PanMain.addWidget(self.page_download)
+        
+        # 默认显示第一个页面
+        self.PanMain.setCurrentIndex(0)
+
 
         self.retranslateUi(FormMain)
         QtCore.QMetaObject.connectSlotsByName(FormMain)

Plain_Craft_Launcher_2/Modules/Base/ModPage.py

@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
-from PyQt5.QtWidgets import QWidget, QFrame
-import importlib
-import sys
+from PyQt5.QtWidgets import QStackedWidget
 
 from Modules.Base.ModLogging import ModLogging, LoggingType as LT
-from Modules.Base.ModSetup import ModSetup as Setup
-
 from Pages.PageLaunch.PageLaunch import PageLaunch
 from Pages.PageDownload.PageDownload import PageDownload
 
@@ -29,62 +25,38 @@ def __init__(self):
             return
 
         self.logger = ModLogging(module_name="ModPage")
-        self.current_page = None
+        self.current_page_index = 0
         self._initialized = True
 
-    def switch_page(self, pan_main: QFrame, page_id: int) -> bool:
+    def switch_page(self, stack_widget: QStackedWidget, page_id: int) -> bool:
         """切换页面
         
         Args:
-            pan_main: 主面板，用于放置页面
-            page_id: 页面id，如"0"
+            stack_widget: QStackedWidget 实例
+            page_id: 页面索引，如 0 表示 PageLaunch
             
         Returns:
             bool: 切换是否成功
         """
-
-        try:
-            page_class = PAGES[page_id]
-        except IndexError:
-            self.logger.write(f"页面id {page_id} 不存在。", LT.ERROR)
+        # 检查页面索引是否有效
+        if page_id < 0 or page_id >= stack_widget.count():
+            self.logger.write(f"页面索引 {page_id} 超出范围 (0-{stack_widget.count()-1})。", LT.ERROR)
             return False
-
-        for widget in pan_main.findChildren(QWidget):
-            obj_name = widget.objectName()
-            if "Page" in obj_name:
-                self.current_page = widget
-
-        # 如果页面相同，不做任何事情
-        if self.current_page == page_class:
-            self.logger.write(f"页面 {page_class.__name__} 已经是当前页面，无需切换", LT.INFO)
+            
+        # 如果当前已经是该页面，则不做任何操作
+        if stack_widget.currentIndex() == page_id:
+            self.logger.write(f"页面 {page_id} 已经是当前页面，无需切换", LT.INFO)
             return True
-
-        # 记录新页面名称
-        self.logger.write(f"正在切换到页面: {page_class.__name__}", LT.INFO)
-
-        # 删除 PanMain 中的所有子组件
-        for child in pan_main.findChildren(QWidget):
-            child.setParent(None)
-            child.deleteLater()
-
-        # 根据传入的页面名称，实例化对应的页面
+            
+        # 记录新页面索引
+        self.logger.write(f"正在切换到页面索引: {page_id}", LT.INFO)
+        
+        # 使用 QStackedWidget 的原生方法切换页面
         try:
-
-            # 实例化页面
-            page_instance = page_class(pan_main)
-
-            # 设置页面大小
-            page_instance.setGeometry(0, 0, pan_main.width(), pan_main.height())
-
-            # 确保页面在最上层
-            page_instance.raise_()
-
-            # 更新当前页面名称
-            self.current_page = page_class
-
-            self.logger.write(f"成功切换到页面: {page_class.__name__}", LT.INFO)
+            stack_widget.setCurrentIndex(page_id)
+            self.current_page_index = page_id
+            self.logger.write(f"成功切换到页面索引: {page_id}", LT.INFO)
             return True
-
         except Exception as e:
-            self.logger.write(f"切换到页面 {page_class.__name__} 时发生错误: {e}", LT.ERROR)
+            self.logger.write(f"切换到页面索引 {page_id} 时发生错误: {e}", LT.ERROR)
             return False

Plain_Craft_Launcher_2/Pages/PageLaunch/PageLaunch.py

@@ -35,3 +35,10 @@ def __init__(self, parent=None):
         # 初始化左侧 Panel 
         self.PanLeft = PageLaunchLeft(self)
         self.PanLeft.setGeometry(QtCore.QRect(0, 0, 300, (setup.get_settings("size")[1] - setup.get_settings("title_height"))))
+
+
+    def resizeEvent(self, event):
+        """处理页面大小变化"""
+        super().resizeEvent(event)
+        # 更新左侧面板高度
+        self.PanLeft.setFixedHeight(self.height())