feat: Windows UI 优化，禁止跳过

Author: iwangjie

src/windows/ui/countdown.rs

@@ -5,21 +5,43 @@ use std::time::{Duration, Instant};
 use windows::Win32::Foundation::{COLORREF, HWND, LPARAM, LRESULT, RECT, WPARAM};
 use windows::Win32::Graphics::Gdi::{
     BeginPaint, CreateFontW, DeleteObject, EndPaint, FillRect, GetStockObject, HBRUSH,
-    InvalidateRect, PAINTSTRUCT, SelectObject, SetBkMode, SetTextColor, TRANSPARENT, TextOutW,
-    WHITE_BRUSH,
+    InvalidateRect, PAINTSTRUCT, SelectObject, SetBkMode, SetTextColor, TRANSPARENT, WHITE_BRUSH,
 };
 use windows::Win32::UI::WindowsAndMessaging::{
-    CreateWindowExW, DefWindowProcW, DestroyWindow, GetClientRect, GetSystemMetrics, HWND_TOPMOST,
-    KillTimer, RegisterClassW, SM_CXSCREEN, SM_CYSCREEN, SW_HIDE, SW_SHOW, SWP_NOMOVE, SWP_NOSIZE,
-    SetTimer, SetWindowPos, ShowWindow, WM_CLOSE, WM_PAINT, WM_TIMER, WNDCLASSW, WS_EX_TOOLWINDOW,
-    WS_EX_TOPMOST, WS_POPUP, WS_VISIBLE,
+    CreateWindowExW, DT_CENTER, DT_SINGLELINE, DT_VCENTER, DefWindowProcW, DestroyWindow,
+    DrawTextW, GetClientRect, GetSystemMetrics, HWND_TOPMOST, KillTimer, RegisterClassW,
+    SM_CXVIRTUALSCREEN, SM_CYVIRTUALSCREEN, SM_XVIRTUALSCREEN, SM_YVIRTUALSCREEN, SW_HIDE, SW_SHOW,
+    SWP_NOMOVE, SWP_NOSIZE, SetTimer, SetWindowPos, ShowWindow, WM_CLOSE, WM_KEYDOWN,
+    WM_LBUTTONDOWN, WM_PAINT, WM_TIMER, WNDCLASSW, WS_EX_TOOLWINDOW, WS_EX_TOPMOST, WS_POPUP,
+    WS_VISIBLE,
 };
 use windows::core::PCWSTR;
 
 use super::super::constants::{APP_NAME_ZH, COUNTDOWN_TIMER_ID, COUNTDOWN_WINDOW_CLASS};
 use super::super::state::with_state;
 use super::super::utils::{SoundType, format_countdown, play_sound, to_wide_string};
 
+fn clamp_i32(v: i32, min: i32, max: i32) -> i32 {
+    if v < min {
+        min
+    } else if v > max {
+        max
+    } else {
+        v
+    }
+}
+
+fn line_rect(full: &RECT, center_y: i32, line_height: i32) -> RECT {
+    let top = center_y - (line_height / 2);
+    let bottom = center_y + (line_height / 2);
+    RECT {
+        left: full.left,
+        top,
+        right: full.right,
+        bottom,
+    }
+}
+
 /// 倒计时窗口过程
 #[allow(unsafe_op_in_unsafe_fn, clippy::too_many_lines)]
 pub unsafe extern "system" fn countdown_wndproc(
@@ -60,11 +82,23 @@ pub unsafe extern "system" fn countdown_wndproc(
                 )
             });
 
-            // 绘制标题
+            let width = rect.right - rect.left;
+            let height = rect.bottom - rect.top;
+            let base = width.min(height).max(1);
+
+            let title_px = clamp_i32(base / 18, 28, 56);
+            let countdown_px = clamp_i32(base / 9, 64, 144);
+            let hint_px = clamp_i32(base / 28, 18, 36);
+
+            let title_center_y = rect.top + height * 32 / 100;
+            let countdown_center_y = rect.top + height * 50 / 100;
+            let hint_center_y = rect.top + height * 68 / 100;
+
+            // 绘制标题（自动居中，避免 DPI/字体导致的错位）
             let title = format!("{APP_NAME_ZH} · 休息倒计时");
             let title_wide = to_wide_string(&title);
             let title_font = CreateFontW(
-                48,
+                -title_px,
                 0,
                 0,
                 0,
@@ -77,18 +111,22 @@ pub unsafe extern "system" fn countdown_wndproc(
                 0,
                 0,
                 0,
-                windows::core::w!("Microsoft YaHei"),
+                windows::core::w!("Segoe UI"),
             );
             let old_font = SelectObject(hdc, title_font);
-            let title_y = rect.bottom / 2 - 100;
-            #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-            let title_x = (rect.right - (title.chars().count() as i32 * 24)) / 2;
-            let _ = TextOutW(hdc, title_x, title_y, &title_wide[..title_wide.len() - 1]);
+            let mut title_rect = line_rect(&rect, title_center_y, title_px * 2);
+            let _ = DrawTextW(
+                hdc,
+                PCWSTR(title_wide.as_ptr()),
+                -1,
+                &raw mut title_rect,
+                DT_CENTER | DT_VCENTER | DT_SINGLELINE,
+            );
 
             // 绘制倒计时数字
             let countdown_wide = to_wide_string(&countdown_text);
             let countdown_font = CreateFontW(
-                96,
+                -countdown_px,
                 0,
                 0,
                 0,
@@ -101,24 +139,23 @@ pub unsafe extern "system" fn countdown_wndproc(
                 0,
                 0,
                 0,
-                windows::core::w!("Microsoft YaHei"),
+                windows::core::w!("Segoe UI"),
             );
             let _ = SelectObject(hdc, countdown_font);
-            let countdown_y = rect.bottom / 2 - 30;
-            #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-            let countdown_x = (rect.right - (countdown_text.chars().count() as i32 * 48)) / 2;
-            let _ = TextOutW(
+            let mut countdown_rect = line_rect(&rect, countdown_center_y, countdown_px * 2);
+            let _ = DrawTextW(
                 hdc,
-                countdown_x,
-                countdown_y,
-                &countdown_wide[..countdown_wide.len() - 1],
+                PCWSTR(countdown_wide.as_ptr()),
+                -1,
+                &raw mut countdown_rect,
+                DT_CENTER | DT_VCENTER | DT_SINGLELINE,
             );
 
             // 绘制提示文本
             let hint = "放松眼睛，伸展身体";
             let hint_wide = to_wide_string(hint);
             let hint_font = CreateFontW(
-                32,
+                -hint_px,
                 0,
                 0,
                 0,
@@ -131,46 +168,24 @@ pub unsafe extern "system" fn countdown_wndproc(
                 0,
                 0,
                 0,
-                windows::core::w!("Microsoft YaHei"),
+                windows::core::w!("Segoe UI"),
             );
             let _ = SelectObject(hdc, hint_font);
             let _ = SetTextColor(hdc, COLORREF(0x0080_8080)); // 灰色
-            let hint_y = rect.bottom / 2 + 80;
-            #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-            let hint_x = (rect.right - (hint.chars().count() as i32 * 16)) / 2;
-            let _ = TextOutW(hdc, hint_x, hint_y, &hint_wide[..hint_wide.len() - 1]);
-
-            // 绘制跳过按钮提示
-            let skip_hint = "按 ESC 或点击任意位置跳过";
-            let skip_wide = to_wide_string(skip_hint);
-            let skip_font = CreateFontW(
-                24,
-                0,
-                0,
-                0,
-                400,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                windows::core::w!("Microsoft YaHei"),
+            let mut hint_rect = line_rect(&rect, hint_center_y, hint_px * 2);
+            let _ = DrawTextW(
+                hdc,
+                PCWSTR(hint_wide.as_ptr()),
+                -1,
+                &raw mut hint_rect,
+                DT_CENTER | DT_VCENTER | DT_SINGLELINE,
             );
-            let _ = SelectObject(hdc, skip_font);
-            let skip_y = rect.bottom / 2 + 140;
-            #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-            let skip_x = (rect.right - (skip_hint.chars().count() as i32 * 12)) / 2;
-            let _ = TextOutW(hdc, skip_x, skip_y, &skip_wide[..skip_wide.len() - 1]);
 
             // 清理
             let _ = SelectObject(hdc, old_font);
             let _ = DeleteObject(title_font);
             let _ = DeleteObject(countdown_font);
             let _ = DeleteObject(hint_font);
-            let _ = DeleteObject(skip_font);
 
             let _ = EndPaint(hwnd, &raw const ps);
             LRESULT(0)
@@ -187,19 +202,10 @@ pub unsafe extern "system" fn countdown_wndproc(
             }
             LRESULT(0)
         }
-        // 处理鼠标点击和键盘事件 - 跳过休息
-        0x0201 | 0x0100 => {
-            // WM_LBUTTONDOWN | WM_KEYDOWN
-            // ESC 键或鼠标点击跳过
-            if msg == 0x0100 && wparam.0 != 0x1B {
-                // 不是 ESC 键
-                return DefWindowProcW(hwnd, msg, wparam, lparam);
-            }
-            close_countdown_window();
-            LRESULT(0)
-        }
+        // 禁止跳过休息：吞掉鼠标点击 / 键盘事件
+        WM_LBUTTONDOWN | WM_KEYDOWN => LRESULT(0),
         WM_CLOSE => {
-            close_countdown_window();
+            // 禁止用户关闭窗口；程序结束/计时结束时会主动 DestroyWindow
             LRESULT(0)
         }
         _ => DefWindowProcW(hwnd, msg, wparam, lparam),
@@ -230,9 +236,11 @@ pub fn show_countdown_window(seconds: u64, play_start_sound: bool) {
         play_sound(SoundType::BreakStart);
     }
 
-    // 获取屏幕尺寸
-    let screen_width = unsafe { GetSystemMetrics(SM_CXSCREEN) };
-    let screen_height = unsafe { GetSystemMetrics(SM_CYSCREEN) };
+    // 覆盖所有显示器（虚拟屏幕），避免多屏幕下窗口尺寸/位置错乱
+    let screen_x = unsafe { GetSystemMetrics(SM_XVIRTUALSCREEN) };
+    let screen_y = unsafe { GetSystemMetrics(SM_YVIRTUALSCREEN) };
+    let screen_width = unsafe { GetSystemMetrics(SM_CXVIRTUALSCREEN) };
+    let screen_height = unsafe { GetSystemMetrics(SM_CYVIRTUALSCREEN) };
 
     let class_name = to_wide_string(COUNTDOWN_WINDOW_CLASS);
 
@@ -243,8 +251,8 @@ pub fn show_countdown_window(seconds: u64, play_start_sound: bool) {
             PCWSTR(class_name.as_ptr()),
             PCWSTR::null(),
             WS_POPUP | WS_VISIBLE,
-            0,
-            0,
+            screen_x,
+            screen_y,
             screen_width,
             screen_height,
             None,

src/windows/ui/tray.rs

@@ -8,7 +8,7 @@ use windows::Win32::UI::Shell::{
     Shell_NotifyIconW,
 };
 use windows::Win32::UI::WindowsAndMessaging::{
-    AppendMenuW, CreatePopupMenu, DestroyMenu, GetCursorPos, IMAGE_ICON, LR_SHARED, LoadImageW,
+    AppendMenuW, CreatePopupMenu, DestroyMenu, GetCursorPos, IDI_APPLICATION, LoadIconW,
     MF_DISABLED, MF_GRAYED, MF_SEPARATOR, MF_STRING, SetForegroundWindow, TPM_BOTTOMALIGN,
     TPM_LEFTALIGN, TrackPopupMenu,
 };
@@ -139,20 +139,12 @@ pub fn setup_tray_icon(hwnd: HWND) {
 
 /// 加载托盘图标
 fn load_tray_icon() -> windows::Win32::UI::WindowsAndMessaging::HICON {
-    // 尝试加载自定义图标，失败则使用系统默认图标
-    // 这里使用系统默认图标作为后备
+    // 使用稳定的系统默认图标，避免因资源加载失败导致托盘图标缺失。
+    // 需要更换为应用图标时，建议通过资源文件（.rc）或在安装包中提供 .ico。
     unsafe {
-        let icon = LoadImageW(
-            None,
-            windows::core::w!("shell32.dll,13"), // 使用系统图标
-            IMAGE_ICON,
-            16,
-            16,
-            LR_SHARED,
-        );
-        icon.map_or_else(
+        LoadIconW(None, IDI_APPLICATION).map_or_else(
             |_| windows::Win32::UI::WindowsAndMessaging::HICON::default(),
-            |h| windows::Win32::UI::WindowsAndMessaging::HICON(h.0),
+            |h| h,
         )
     }
 }