浮窗优化

Author: lzy98276

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

@@ -11,6 +11,9 @@ v2.3 - Shiroko (砂狼白子) beta 2
 - 优化 **ClassIsland 联动**，现在可以传递通知类型，并提醒用户安装插件。
 - 优化 **计时器**，阻止外部关闭窗口
 - 优化 **浮窗**，阻止外部关闭窗口
+- 优化 **浮窗**，启动即自动收纳
+- 优化 **浮窗**，切换同步收纳显示
+- 优化 **计时器**，倒计时页面居中显示，秒表居中与所有时钟字距优化
 
 ## 🐛 修复问题
 

app/common/notification/notification_service.py

@@ -1031,7 +1031,7 @@ def _normalize_text(value):
                 draw_count,
                 settings,
                 settings_group,
-                is_animating
+                is_animating,
             )
             if status:
                 logger.info("成功发送通知到ClassIsland，结果未知")

app/view/another_window/countdown_timer.py

@@ -576,9 +576,11 @@ def _build_left_panel(self):
         outer_layout = QVBoxLayout(self.left_container)
         outer_layout.setContentsMargins(0, 0, 0, 0)
         outer_layout.setSpacing(0)
+        self._left_outer_layout = outer_layout
 
         center_widget = QWidget(self.left_container)
         center_widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self._left_center_widget = center_widget
         ring_layer = QGridLayout(center_widget)
         ring_layer.setContentsMargins(0, 0, 0, 0)
         ring_layer.setSpacing(0)
@@ -590,7 +592,8 @@ def _build_left_panel(self):
         ring_layer.addWidget(self.digit_panel, 0, 0, 1, 1)
 
         outer_layout.addStretch(1)
-        outer_layout.addWidget(center_widget, 0, Qt.AlignCenter)
+        outer_layout.addWidget(center_widget, 0)
+        outer_layout.setAlignment(center_widget, Qt.AlignHCenter | Qt.AlignVCenter)
         outer_layout.addStretch(1)
 
     def _build_digit_panel(self, parent_widget=None):
@@ -634,7 +637,7 @@ def _build_digit_panel(self, parent_widget=None):
 
         digits_row = QHBoxLayout()
         digits_row.setContentsMargins(0, 0, 0, 0)
-        digits_row.setSpacing(4)
+        digits_row.setSpacing(0)
         digits_row.setAlignment(Qt.AlignCenter)
 
         minus_row = QHBoxLayout()
@@ -679,6 +682,13 @@ def _build_digit_panel(self, parent_widget=None):
         self._ms_minus_placeholder.setVisible(False)
         minus_row.addWidget(self._ms_minus_placeholder)
 
+        for row in (plus_row, digits_row, minus_row):
+            row.insertStretch(0, 1)
+            row.addStretch(1)
+        self._digit_plus_row_layout = plus_row
+        self._digit_digits_row_layout = digits_row
+        self._digit_minus_row_layout = minus_row
+
         digit_v.addLayout(plus_row)
         digit_v.addLayout(digits_row)
         digit_v.addLayout(minus_row)
@@ -757,7 +767,7 @@ def _build_controls_panel(self):
             onClick=lambda: self._set_preset_category("recent"),
         )
         self.preset_segment.setCurrentItem("common")
-        preset_panel_layout.addWidget(self.preset_segment, 0, Qt.AlignCenter)
+        preset_panel_layout.addWidget(self.preset_segment, 0, Qt.AlignLeft)
 
         self._common_presets = [
             _Preset("05:00", 5 * 60),
@@ -785,7 +795,7 @@ def _build_controls_panel(self):
         preset_panel_layout.addLayout(self.preset_grid)
         self._sync_preset_buttons()
 
-        controls_layout.addWidget(self.preset_panel, 0, Qt.AlignTop)
+        controls_layout.addWidget(self.preset_panel, 0, Qt.AlignTop | Qt.AlignLeft)
         self._build_stopwatch_panel(controls_layout)
         controls_layout.addStretch(1)
 
@@ -1209,25 +1219,42 @@ def _apply_time_font(self, mode: str):
                     int(digit_metrics.horizontalAdvance("0")),
                     int(digit_metrics.horizontalAdvance("8")),
                 )
-                + 8
+                + 4
             )
 
             sample_colon_font = QFont(self._font_family, int(colon_size))
             sample_colon_font.setBold(True)
             colon_metrics = QFontMetrics(sample_colon_font)
-            colon_width = int(colon_metrics.horizontalAdvance(":")) + 6
+            colon_width = int(colon_metrics.horizontalAdvance(":")) + 2
 
             sample_ms_font = QFont(self._font_family, int(ms_size))
             sample_ms_font.setBold(True)
             ms_metrics = QFontMetrics(sample_ms_font)
-            ms_width = int(ms_metrics.horizontalAdvance(".000")) + 10
+            ms_width = int(ms_metrics.horizontalAdvance(".000")) + 2
         else:
             digit_size = 50
-            digit_width = 42
             colon_size = 42
             ms_size = 32
-            ms_width = 84
-            colon_width = 14
+            sample_digit_font = QFont(self._font_family, int(digit_size))
+            sample_digit_font.setBold(True)
+            digit_metrics = QFontMetrics(sample_digit_font)
+            digit_width = (
+                max(
+                    int(digit_metrics.horizontalAdvance("0")),
+                    int(digit_metrics.horizontalAdvance("8")),
+                )
+                + 4
+            )
+
+            sample_colon_font = QFont(self._font_family, int(colon_size))
+            sample_colon_font.setBold(True)
+            colon_metrics = QFontMetrics(sample_colon_font)
+            colon_width = int(colon_metrics.horizontalAdvance(":")) + 2
+
+            sample_ms_font = QFont(self._font_family, int(ms_size))
+            sample_ms_font.setBold(True)
+            ms_metrics = QFontMetrics(sample_ms_font)
+            ms_width = int(ms_metrics.horizontalAdvance(".000")) + 2
         date_size = 18 if mode == "clock" else 16
 
         for lab in self._digit_labels:
@@ -1381,6 +1408,7 @@ def _sync_controls_state(self):
             or force_compact_by_width
         )
         self._set_compact_view(desired_compact)
+
         if not is_mini:
             self.left_container.setSizePolicy(
                 QSizePolicy.Minimum, QSizePolicy.Expanding
@@ -1482,21 +1510,68 @@ def _sync_controls_state(self):
             and self._center_between_spacer is not None
             and self._center_right_spacer is not None
         ):
+            digit_rows = [
+                getattr(self, "_digit_plus_row_layout", None),
+                getattr(self, "_digit_digits_row_layout", None),
+                getattr(self, "_digit_minus_row_layout", None),
+            ]
+            for row in digit_rows:
+                if row is not None and row.count() >= 2:
+                    row.setStretch(0, 1)
+                    row.setStretch(row.count() - 1, 1)
+
+            base_margin = 20 if w and (w.isFullScreen() or w.isMaximized()) else 0
+            between_w = 0
+            if not is_mini and not desired_compact:
+                if mode == "clock":
+                    between_w = 0
+                elif window_width > 550:
+                    between_w = 20
+                else:
+                    between_w = 0
+
+            extra_left = 0
+            if not is_mini:
+                if (
+                    mode == "countdown"
+                    and getattr(self, "preset_panel", None) is not None
+                    and self.preset_panel.isVisible()
+                    and getattr(self, "right_container", None) is not None
+                    and self.right_container.isVisible()
+                ):
+                    extra_left = between_w + max(
+                        0, int(self.right_container.sizeHint().width())
+                    )
+                elif (
+                    mode == "stopwatch"
+                    and getattr(self, "right_container", None) is not None
+                    and self.right_container.isVisible()
+                ):
+                    extra_left = between_w + max(
+                        0, int(self.right_container.sizeHint().width())
+                    )
+
+            try:
+                cap = max(
+                    0,
+                    int(window_width)
+                    - max(0, int(self.left_container.sizeHint().width()))
+                    - 10,
+                )
+                extra_left = min(int(extra_left), int(cap))
+            except Exception:
+                extra_left = int(extra_left)
+
             self._center_left_spacer.changeSize(
-                0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum
+                int(base_margin) + int(extra_left),
+                0,
+                QSizePolicy.Expanding,
+                QSizePolicy.Minimum,
             )
             self._center_right_spacer.changeSize(
-                0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum
+                int(base_margin), 0, QSizePolicy.Expanding, QSizePolicy.Minimum
             )
 
-            if w and (w.isFullScreen() or w.isMaximized()):
-                self._center_left_spacer.changeSize(
-                    20, 0, QSizePolicy.Expanding, QSizePolicy.Minimum
-                )
-                self._center_right_spacer.changeSize(
-                    20, 0, QSizePolicy.Expanding, QSizePolicy.Minimum
-                )
-
             if not is_mini and not desired_compact:
                 # For clock mode the right panel is hidden; keep the center
                 # spacer fixed so the left clock container stays centered.
@@ -1506,7 +1581,7 @@ def _sync_controls_state(self):
                     )
                 elif window_width > 550:
                     self._center_between_spacer.changeSize(
-                        20, 0, QSizePolicy.MinimumExpanding, QSizePolicy.Minimum
+                        20, 0, QSizePolicy.Fixed, QSizePolicy.Minimum
                     )
                 else:
                     self._center_between_spacer.changeSize(

app/view/floating_window/levitation.py

@@ -89,18 +89,20 @@ def __init__(self, parent=None):
         # ==================== 构建UI ====================
         self._build_ui()
         self._apply_position()
-        self._apply_window()
-        self._install_drag_filters()
 
         # ==================== 信号连接 ====================
         self._connect_signals()
 
         # ==================== 主题应用 ====================
         self._apply_theme_style()
 
+        self._apply_window()
+        self._install_drag_filters()
+
         # ==================== 启动周期性置顶 ====================
         self._start_periodic_topmost()
-        self._startup_initial_show = False
+        if not bool(getattr(self, "_visible_on_start", False)):
+            QTimer.singleShot(0, lambda: self._check_edge_proximity(immediate=True))
 
     # ==================== 初始化方法 ====================
 
@@ -1010,9 +1012,20 @@ def toggle_user_requested_visible(self) -> None:
 
     def set_user_requested_visible(self, visible: bool) -> None:
         self._user_requested_visible = bool(visible)
+        storage = getattr(self, "storage_window", None)
         if self._user_requested_visible:
             super().show()
+            if bool(getattr(self, "_retracted", False)) and storage is not None:
+                try:
+                    storage.show()
+                except Exception:
+                    pass
         else:
+            if storage is not None and bool(storage.isVisible()):
+                try:
+                    storage.hide()
+                except Exception:
+                    pass
             super().hide()
 
     def _apply_size_setting(self, size_idx: int):
@@ -1129,7 +1142,17 @@ def showEvent(self, event):
         super().showEvent(event)
         if not bool(getattr(self, "_suppress_visibility_tracking", False)):
             self._user_requested_visible = True
-        QTimer.singleShot(100, self._check_edge_proximity)
+            if bool(getattr(self, "_retracted", False)):
+                storage = getattr(self, "storage_window", None)
+                if storage is not None and not bool(storage.isVisible()):
+                    try:
+                        storage.show()
+                    except Exception:
+                        pass
+        if bool(getattr(self, "_startup_initial_show", False)):
+            self._check_edge_proximity(immediate=True)
+        else:
+            QTimer.singleShot(100, self._check_edge_proximity)
         if bool(getattr(self, "_startup_initial_show", False)):
             self._startup_initial_show = False
             self._schedule_auto_hide(force=False)
@@ -1144,6 +1167,12 @@ def hideEvent(self, event):
         super().hideEvent(event)
         if not bool(getattr(self, "_suppress_visibility_tracking", False)):
             self._user_requested_visible = False
+            storage = getattr(self, "storage_window", None)
+            if storage is not None and bool(storage.isVisible()):
+                try:
+                    storage.hide()
+                except Exception:
+                    pass
         self._apply_topmost_runtime()
 
     def closeEvent(self, event):
@@ -2093,7 +2122,7 @@ def _expand_from_edge(self):
         self._retracted = False
         # logger.debug(f"_expand_from_edge: 窗口位置已展开到 ({self.x()}, {self.y()})")
 
-    def _check_edge_proximity(self):
+    def _check_edge_proximity(self, immediate: bool = False):
         """检测窗口是否靠近屏幕边缘，并实现贴边隐藏功能（带动画效果）"""
         # logger.debug("开始检查边缘贴边隐藏功能")
 
@@ -2129,6 +2158,27 @@ def _check_edge_proximity(self):
             if not hasattr(self, "_original_position"):
                 self._original_position = window_pos
 
+            if bool(immediate):
+                end_rect = QRect(
+                    screen.left() - window_width + 1,
+                    window_pos.y(),
+                    window_width,
+                    window_height,
+                )
+                try:
+                    self.setGeometry(end_rect)
+                except Exception:
+                    pass
+                self._create_arrow_button(
+                    "right",
+                    0,
+                    window_pos.y()
+                    + window_height // 2
+                    - self._storage_btn_size.height() // 2,
+                )
+                self._retracted = True
+                return
+
             # 创建平滑动画效果
             self.animation = QPropertyAnimation(self, b"geometry")
             # 设置动画持续时间（更流畅的过渡）
@@ -2175,6 +2225,27 @@ def on_animation_finished():
             if not hasattr(self, "_original_position"):
                 self._original_position = window_pos
 
+            if bool(immediate):
+                end_rect = QRect(
+                    screen.right() - 1,
+                    window_pos.y(),
+                    window_width,
+                    window_height,
+                )
+                try:
+                    self.setGeometry(end_rect)
+                except Exception:
+                    pass
+                self._create_arrow_button(
+                    "left",
+                    screen.width() - self._storage_btn_size.width(),
+                    window_pos.y()
+                    + window_height // 2
+                    - self._storage_btn_size.height() // 2,
+                )
+                self._retracted = True
+                return
+
             # 创建平滑动画效果
             self.animation = QPropertyAnimation(self, b"geometry")
             # 设置动画持续时间（更流畅的过渡）