优化UIA置顶判断&新增主窗口置顶

lzy98276 · lzy98276 · commit 6d482bb8b744 · 2026-01-29T16:43:18.000+08:00
diff --git a/CHANGELOG/v2.3.0-beta.1/CHANGELOG.md b/CHANGELOG/v2.3.0-beta.1/CHANGELOG.md
@@ -6,12 +6,14 @@ v2.3 - Shirako (砂狼白子) beta 1
 
 - 新增 **置顶模式**，支持UIA置顶
 - 新增 **UIAccess提权**，自动重启生效
+- 新增 **主窗口置顶**，基础设置支持主窗口置顶配置
 
 ## 💡 功能优化
 
 - 优化 **UIA置顶**，统一封装DLL调用
 - 优化 **UIA置顶**，切换后支持提权重启
 - 优化 **UIA置顶**，提权后主界面显示再重启
+- 优化 **UIA置顶**，若已在UIA环境则无需重启
 
 ## 🐛 修复问题
 
diff --git a/app/Language/modules/basic_settings.py b/app/Language/modules/basic_settings.py
@@ -27,6 +27,35 @@
             "description": "设置软件启动时是否自动显示主窗口",
             "switchbutton_name": {"enable": "", "disable": ""},
         },
+        "main_window_topmost_mode": {
+            "name": "主窗口置顶",
+            "description": "选择主窗口置顶方式（UIA置顶需以管理员运行）",
+            "combo_items": ["关闭置顶", "置顶", "UIA置顶"],
+        },
+        "uia_topmost_restart_dialog_title": {
+            "name": "需要重启",
+            "description": "UIA置顶切换后重启提示标题",
+        },
+        "uia_topmost_restart_dialog_content": {
+            "name": "已切换为UIA置顶模式，需要重启生效，是否立即重启？",
+            "description": "UIA置顶切换后重启提示内容",
+        },
+        "uia_topmost_disable_restart_dialog_content": {
+            "name": "已关闭UIA置顶模式，需要完全退出软件后重新启动才会生效",
+            "description": "关闭UIA置顶后提示内容",
+        },
+        "uia_topmost_disable_restart_dialog_ok_btn": {
+            "name": "知道了",
+            "description": "关闭UIA置顶后提示按钮文本",
+        },
+        "uia_topmost_restart_dialog_restart_btn": {
+            "name": "重启",
+            "description": "UIA置顶切换后重启按钮文本",
+        },
+        "uia_topmost_restart_dialog_cancel_btn": {
+            "name": "取消",
+            "description": "UIA置顶切换后取消按钮文本",
+        },
         "background_resident": {
             "name": "后台驻留",
             "description": "关闭所有窗口后是否仍在后台常驻",
@@ -384,6 +413,35 @@
             "name": "Show splash screen",
             "description": "Set whether to show the splash screen on boot",
         },
+        "main_window_topmost_mode": {
+            "name": "Main window topmost",
+            "description": "Select main window topmost mode (UIA requires run as administrator)",
+            "combo_items": ["Disable topmost", "Topmost", "UIA topmost"],
+        },
+        "uia_topmost_restart_dialog_title": {
+            "name": "Restart Required",
+            "description": "Restart dialog title after switching UIA topmost",
+        },
+        "uia_topmost_restart_dialog_content": {
+            "name": "UIA topmost mode has been enabled. Restart now to apply changes?",
+            "description": "Restart dialog content after switching UIA topmost",
+        },
+        "uia_topmost_disable_restart_dialog_content": {
+            "name": "UIA topmost mode has been disabled. Fully exit the app and relaunch to apply.",
+            "description": "Hint content after disabling UIA topmost",
+        },
+        "uia_topmost_disable_restart_dialog_ok_btn": {
+            "name": "OK",
+            "description": "OK button text after disabling UIA topmost",
+        },
+        "uia_topmost_restart_dialog_restart_btn": {
+            "name": "Restart",
+            "description": "Restart button text after switching UIA topmost",
+        },
+        "uia_topmost_restart_dialog_cancel_btn": {
+            "name": "Cancel",
+            "description": "Cancel button text after switching UIA topmost",
+        },
         "export_diagnostic_data": {
             "name": "Export diagnostic data",
             "description": "Export Diagnostic Information on Exit",
diff --git a/app/tools/settings_default_storage.py b/app/tools/settings_default_storage.py
@@ -32,6 +32,7 @@
         "simplified_mode": {"default_value": True},
         "autostart": {"default_value": False},
         "show_startup_window": {"default_value": True},
+        "main_window_topmost_mode": {"default_value": 0},
         "background_resident": {"default_value": True},
         "auto_save_window_size": {"default_value": True},
         "url_protocol": {"default_value": False},
diff --git a/app/view/main/window.py b/app/view/main/window.py
@@ -4,7 +4,7 @@
 from loguru import logger
 from PySide6.QtWidgets import QApplication, QWidget
 from PySide6.QtGui import QIcon
-from PySide6.QtCore import QTimer, QEvent, Signal, QThreadPool, QRunnable
+from PySide6.QtCore import QTimer, QEvent, Signal, QThreadPool, QRunnable, Qt
 from qfluentwidgets import FluentWindow, NavigationItemPosition
 
 from app.common.IPC_URL.csharp_ipc_handler import CSharpIPCHandler
@@ -146,6 +146,37 @@ def _setup_window_properties(self):
             QIcon(str(get_data_path("assets/icon", "secrandom-icon-paper.png")))
         )
         self._position_window()
+        self._setup_general_settings_listener()
+        self._apply_topmost_mode()
+
+    def _setup_general_settings_listener(self):
+        """设置通用设置监听器"""
+        from app.tools.settings_access import get_settings_signals
+
+        get_settings_signals().settingChanged.connect(self._on_general_setting_changed)
+
+    def _on_general_setting_changed(self, first, second, value):
+        """处理通用设置变更"""
+        if first == "basic_settings" and second == "main_window_topmost_mode":
+            self._apply_topmost_mode(value)
+
+    def _apply_topmost_mode(self, mode=None):
+        """应用主窗口置顶模式"""
+        if mode is None:
+            mode = (
+                readme_settings_async("basic_settings", "main_window_topmost_mode") or 0
+            )
+
+        mode = int(mode)
+        flags = self.windowFlags()
+        if mode != 0:
+            flags |= Qt.WindowStaysOnTopHint
+        else:
+            flags &= ~Qt.WindowStaysOnTopHint
+
+        self.setWindowFlags(flags)
+        if self.isVisible():
+            self.show()
 
     def _setup_url_handler(self):
         """设置URL处理器"""
diff --git a/app/view/settings/basic_settings.py b/app/view/settings/basic_settings.py
@@ -3,8 +3,11 @@
 # ==================================================
 
 from loguru import logger
+import os
+import ctypes
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QApplication
 from PySide6.QtGui import QFontDatabase
+from PySide6.QtCore import QSignalBlocker
 from qfluentwidgets import (
     GroupHeaderCardWidget,
     SwitchButton,
@@ -15,8 +18,11 @@
     Theme,
     setTheme,
     setThemeColor,
+    MessageBox,
 )
 
+from app.tools.variable import EXIT_CODE_RESTART
+
 from app.tools.personalised import get_theme_icon
 from app.tools.settings_access import readme_settings_async, update_settings
 from app.tools.settings_visibility_manager import is_setting_visible
@@ -41,6 +47,7 @@
     NotificationConfig,
 )
 from app.common.IPC_URL import URLIPCHandler
+from app.common.windows.uiaccess import is_uiaccess_process
 from app.page_building.another_window import (
     create_log_viewer_window,
     create_backup_manager_window,
@@ -150,6 +157,19 @@ def __init__(self, parent=None):
             self.__on_auto_save_window_size_changed
         )
 
+        # 主窗口置顶设置
+        self.main_window_topmost_mode_combo_box = ComboBox()
+        self.main_window_topmost_mode_combo_box.addItems(
+            get_content_combo_name_async("basic_settings", "main_window_topmost_mode")
+        )
+        topmost_mode = readme_settings_async(
+            "basic_settings", "main_window_topmost_mode"
+        )
+        self.main_window_topmost_mode_combo_box.setCurrentIndex(int(topmost_mode or 0))
+        self.main_window_topmost_mode_combo_box.currentIndexChanged.connect(
+            self.__on_main_window_topmost_mode_changed
+        )
+
         # 后台驻留设置
         self.resident_switch = SwitchButton()
         self.resident_switch.setOffText(
@@ -215,6 +235,15 @@ def __init__(self, parent=None):
                 ),
                 self.auto_save_window_size_switch,
             )
+        if is_setting_visible("basic_settings", "main_window_topmost_mode"):
+            self.addGroup(
+                get_theme_icon("ic_fluent_pin_20_filled"),
+                get_content_name_async("basic_settings", "main_window_topmost_mode"),
+                get_content_description_async(
+                    "basic_settings", "main_window_topmost_mode"
+                ),
+                self.main_window_topmost_mode_combo_box,
+            )
         if is_setting_visible("basic_settings", "background_resident"):
             self.addGroup(
                 get_theme_icon("ic_fluent_resize_20_filled"),
@@ -388,6 +417,107 @@ def __on_auto_save_window_size_changed(self, checked):
                 parent=self.window(),
             )
 
+    def __on_main_window_topmost_mode_changed(self, index):
+        previous_index = int(
+            readme_settings_async("basic_settings", "main_window_topmost_mode") or 0
+        )
+
+        # 如果当前已经是 UIA 进程，切换到 UIA 模式不需要重启
+        if index == 2 and is_uiaccess_process():
+            update_settings("basic_settings", "main_window_topmost_mode", index)
+            return
+
+        # 如果当前是 UIA 进程，且浮窗也是 UIA 模式，切换回非 UIA 模式不需要重启（因为进程必须保持 UIA）
+        if previous_index == 2 and index != 2 and is_uiaccess_process():
+            floating_mode = int(
+                readme_settings_async(
+                    "floating_window_management", "floating_window_topmost_mode"
+                )
+                or 0
+            )
+            if floating_mode == 2:
+                update_settings("basic_settings", "main_window_topmost_mode", index)
+                return
+
+        if previous_index == 2 and index != 2:
+            dialog = MessageBox(
+                get_content_name_async(
+                    "basic_settings", "uia_topmost_restart_dialog_title"
+                ),
+                get_content_name_async(
+                    "basic_settings",
+                    "uia_topmost_disable_restart_dialog_content",
+                ),
+                self.window(),
+            )
+            dialog.yesButton.setText(
+                get_content_name_async(
+                    "basic_settings",
+                    "uia_topmost_disable_restart_dialog_ok_btn",
+                )
+            )
+            dialog.cancelButton.setText(
+                get_content_name_async(
+                    "basic_settings",
+                    "uia_topmost_restart_dialog_cancel_btn",
+                )
+            )
+            if dialog.exec():
+                update_settings("basic_settings", "main_window_topmost_mode", index)
+            else:
+                blocker = QSignalBlocker(self.main_window_topmost_mode_combo_box)
+                self.main_window_topmost_mode_combo_box.setCurrentIndex(previous_index)
+                del blocker
+            return
+
+        if index == 2 and previous_index != 2:
+            dialog = MessageBox(
+                get_content_name_async(
+                    "basic_settings", "uia_topmost_restart_dialog_title"
+                ),
+                get_content_name_async(
+                    "basic_settings", "uia_topmost_restart_dialog_content"
+                ),
+                self.window(),
+            )
+            dialog.yesButton.setText(
+                get_content_name_async(
+                    "basic_settings",
+                    "uia_topmost_restart_dialog_restart_btn",
+                )
+            )
+            dialog.cancelButton.setText(
+                get_content_name_async(
+                    "basic_settings",
+                    "uia_topmost_restart_dialog_cancel_btn",
+                )
+            )
+            if dialog.exec():
+                update_settings("basic_settings", "main_window_topmost_mode", index)
+                try:
+                    from app.common.windows.uiaccess import (
+                        ELEVATE_RESTART_ENV,
+                        UIACCESS_RESTART_ENV,
+                    )
+
+                    os.environ[str(UIACCESS_RESTART_ENV)] = "1"
+                    try:
+                        is_admin = bool(ctypes.windll.shell32.IsUserAnAdmin())
+                    except Exception:
+                        is_admin = False
+                    if not is_admin:
+                        os.environ[str(ELEVATE_RESTART_ENV)] = "1"
+                except Exception:
+                    pass
+                QApplication.exit(EXIT_CODE_RESTART)
+            else:
+                blocker = QSignalBlocker(self.main_window_topmost_mode_combo_box)
+                self.main_window_topmost_mode_combo_box.setCurrentIndex(previous_index)
+                del blocker
+            return
+
+        update_settings("basic_settings", "main_window_topmost_mode", index)
+
     def __on_url_protocol_changed(self, checked):
         """URL协议开关变化处理"""
         # 临时断开信号连接，避免递归
diff --git a/app/view/settings/floating_window_management.py b/app/view/settings/floating_window_management.py
@@ -18,6 +18,7 @@
 from app.tools.settings_access import *
 from app.Language.obtain_language import *
 from app.tools.settings_visibility_manager import is_setting_visible
+from app.common.windows.uiaccess import is_uiaccess_process
 
 
 # ==================================================
@@ -296,6 +297,25 @@ def floating_window_topmost_mode_combo_box_changed(self, index):
                 "floating_window_management", "floating_window_topmost_mode"
             )
         )
+
+        # 如果当前已经是 UIA 进程，切换到 UIA 模式不需要重启
+        if index == 2 and is_uiaccess_process():
+            update_settings(
+                "floating_window_management", "floating_window_topmost_mode", index
+            )
+            return
+
+        # 如果当前是 UIA 进程，且主窗口也是 UIA 模式，切换回非 UIA 模式不需要重启（因为进程必须保持 UIA）
+        if previous_index == 2 and index != 2 and is_uiaccess_process():
+            main_window_mode = int(
+                readme_settings_async("basic_settings", "main_window_topmost_mode") or 0
+            )
+            if main_window_mode == 2:
+                update_settings(
+                    "floating_window_management", "floating_window_topmost_mode", index
+                )
+                return
+
         if previous_index == 2 and index != 2:
             dialog = MessageBox(
                 get_content_name_async(
