修复Linux浮窗无焦点激活异常&修复无法展开设置侧边栏

Author: lzy98276

CHANGELOG/v2.3.0-beta.1/CHANGELOG.md

@@ -23,6 +23,7 @@ v2.3 - Shirako (砂狼白子) beta 1
 - 修复 **通知浮窗** 开启卡片显示后背景异常
 - 修复 **简化模式** 设置项缺失崩溃
 - 修复 **Linux通知** 缺少notify-send崩溃
+- 修复 **Linux浮窗** 无焦点激活异常
 
 ## 🔧 其它变更
 

app/core/utils.py

@@ -2,6 +2,7 @@
 from typing import Optional, Callable, TypeVar, Any
 from functools import wraps
 from loguru import logger
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QWidget
 
 
@@ -46,7 +47,8 @@ def activate_window(window: QWidget) -> bool:
     try:
         window.show()
         window.raise_()
-        window.activateWindow()
+        if not (window.windowFlags() & Qt.WindowDoesNotAcceptFocus):
+            window.activateWindow()
         return True
     except Exception as e:
         logger.exception(f"激活窗口失败: {e}", exc_info=True)

app/core/window_manager.py

@@ -3,7 +3,7 @@
 from loguru import logger
 from PySide6.QtCore import QTimer
 from app.tools.settings_access import readme_settings_async
-from app.core.utils import safe_execute, safe_close_window
+from app.core.utils import safe_execute, safe_close_window, activate_window
 
 if TYPE_CHECKING:
     from PySide6.QtWidgets import QWidget
@@ -603,8 +603,7 @@ def impl():
                 if action == "show":
                     if not win.isVisible():
                         win.show()
-                    win.raise_()
-                    win.activateWindow()
+                    activate_window(win)
                     return
 
         safe_execute(impl, error_message="执行窗口控制失败")

app/view/settings/settings.py

@@ -117,9 +117,6 @@ def _setup_sidebar_scroll(self):
             return
         if getattr(self, "_sidebar_scroll_area", None) is not None:
             return
-        panel = getattr(navigation, "panel", None)
-        if panel is not None and hasattr(panel, "setMinimumExpandWidth"):
-            panel.setMinimumExpandWidth(0)
 
         scroll_area = SingleDirectionScrollArea(self)
         scroll_area.setWidgetResizable(True)