From b7faa3e213d2f0cce92d4c6089e79b6cfa048092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E5=BE=B7=E6=A3=AE?= Date: Tue, 27 Oct 2026 12:19:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=20Windows=20=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=A0=8F=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=BC=A0=E7=BB=9F?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/desktop/src/main/desktop-menu.ts | 72 +++++++++++++++---- apps/desktop/src/main/desktop.ts | 3 +- apps/desktop/src/main/native-window.ts | 2 +- .../src/components/WindowsTitleBar.tsx | 71 ++++++++++++++++++ apps/desktop/src/renderer/src/main.tsx | 5 +- .../desktop/src/renderer/src/native-bridge.ts | 12 ++++ apps/desktop/src/shared/desktop-events.ts | 15 ++++ .../src/shared/desktop-shortcuts.test.ts | 27 +++++++ apps/desktop/src/shared/desktop-shortcuts.ts | 41 +++++++++++ apps/desktop/src/shared/native-bridge.ts | 3 + ...77\344\270\273\345\256\236\347\216\260.md" | 4 +- ...14\351\235\242\350\256\276\350\256\241.md" | 2 + 12 files changed, 239 insertions(+), 18 deletions(-) create mode 100644 apps/desktop/src/renderer/src/components/WindowsTitleBar.tsx create mode 100644 apps/desktop/src/shared/desktop-shortcuts.test.ts create mode 100644 apps/desktop/src/shared/desktop-shortcuts.ts diff --git a/apps/desktop/src/main/desktop-menu.ts b/apps/desktop/src/main/desktop-menu.ts index 4aed2f9..fb1f637 100644 --- a/apps/desktop/src/main/desktop-menu.ts +++ b/apps/desktop/src/main/desktop-menu.ts @@ -1,11 +1,39 @@ import { productName } from "@shared/brand"; -import { ApplicationMenu, BuildConfig, type ApplicationMenuItemConfig } from "electrobun/main"; +import { + ApplicationMenu, + BuildConfig, + Utils, + type ApplicationMenuItemConfig, +} from "electrobun/main"; -import { focusedWindow, isWindowOpen } from "./native-window"; +import { focusedWindow, isWindowOpen, windowStates, type DesktopWindow } from "./native-window"; -/** 系统菜单继续负责编辑、设置与窗口操作;文本右键由系统 WebView 提供。 */ +/** 窗口按钮与快捷键共用原生动作;关闭必须经过离开房间确认。 */ +export function performDesktopAction(window: DesktopWindow, action: string): boolean { + if (!isWindowOpen(window)) return false; + if (action === "minimize") window.minimize(); + if (action === "maximize") { + if (window.isMaximized()) window.unmaximize(); + else window.maximize(); + } + if (action === "close") window.requestClose(); + if (action === "quit") Utils.quit(); + if (action === "settings") windowStates.get(window.id)?.send("open-settings"); + if (action === "full-screen") window.setFullScreen(!window.isFullScreen()); + if (!BuildConfig.getSync().isPackaged) { + if (action === "reload") window.webview.executeJavascript("location.reload()"); + if (action === "devtools") window.webview.toggleDevTools(); + } + if (action === "reset-zoom") window.setPageZoom(1); + if (action === "zoom-in") window.setPageZoom(Math.min(3, window.getPageZoom() + 0.1)); + if (action === "zoom-out") window.setPageZoom(Math.max(0.5, window.getPageZoom() - 0.1)); + return isWindowOpen(window) && window.isMaximized(); +} + +/** macOS 与 Linux 使用系统菜单;Windows 使用应用标题栏和窗口内快捷键。 */ export function configureApplicationMenu(openSettings: () => void): void { const mac = process.platform === "darwin"; + if (process.platform === "win32") return; const settings = { label: "设置…", action: "settings", accelerator: "CmdOrCtrl+," }; const menu: ApplicationMenuItemConfig[] = [ ...(mac @@ -30,8 +58,20 @@ export function configureApplicationMenu(openSettings: () => void): void { label: "文件", submenu: [ ...(!mac ? [settings, { type: "separator" } as const] : []), - { role: "close", label: "关闭窗口", accelerator: "CmdOrCtrl+W" }, - ...(!mac ? [{ role: "quit", label: "退出", accelerator: "CmdOrCtrl+Q" }] : []), + { + role: "close", + label: "关闭窗口", + accelerator: "CmdOrCtrl+W", + }, + ...(!mac + ? [ + { + role: "quit", + label: "退出", + accelerator: "CmdOrCtrl+Q", + }, + ] + : []), ], }, { @@ -54,7 +94,10 @@ export function configureApplicationMenu(openSettings: () => void): void { { action: "zoom-in", label: "放大", accelerator: "CmdOrCtrl+Plus" }, { action: "zoom-out", label: "缩小", accelerator: "CmdOrCtrl+-" }, { type: "separator" }, - { role: "toggleFullScreen", label: "切换全屏" }, + { + role: "toggleFullScreen", + label: "切换全屏", + }, ...(!BuildConfig.getSync().isPackaged ? [ { type: "separator" } as const, @@ -67,14 +110,18 @@ export function configureApplicationMenu(openSettings: () => void): void { { label: "窗口", submenu: [ - { role: "minimize", label: "最小化", accelerator: "CmdOrCtrl+M" }, + { + role: "minimize", + label: "最小化", + accelerator: "CmdOrCtrl+M", + }, { role: "zoom", label: "缩放窗口" }, ...(mac ? [{ role: "bringAllToFront", label: "全部置于前台" }] : []), ], }, ]; ApplicationMenu.setApplicationMenu(menu); - ApplicationMenu.on("application-menu-clicked", (event) => { + const onClick = (event: unknown) => { const { action } = (event as { data: { action: string } }).data; if (action === "settings") { openSettings(); @@ -82,10 +129,7 @@ export function configureApplicationMenu(openSettings: () => void): void { } const window = focusedWindow(); if (!isWindowOpen(window)) return; - if (action === "reload") window.webview.executeJavascript("location.reload()"); - if (action === "devtools") window.webview.toggleDevTools(); - if (action === "reset-zoom") window.setPageZoom(1); - if (action === "zoom-in") window.setPageZoom(Math.min(3, window.getPageZoom() + 0.1)); - if (action === "zoom-out") window.setPageZoom(Math.max(0.5, window.getPageZoom() - 0.1)); - }); + performDesktopAction(window, action); + }; + ApplicationMenu.on("application-menu-clicked", onClick); } diff --git a/apps/desktop/src/main/desktop.ts b/apps/desktop/src/main/desktop.ts index 3a23fdd..cb97aaf 100644 --- a/apps/desktop/src/main/desktop.ts +++ b/apps/desktop/src/main/desktop.ts @@ -11,7 +11,7 @@ import manifest from "../../package.json"; import { AppUpdateService, createAcceleratedUpdater } from "./app-update"; import { readAppConfig, resolveAppConfigLocation } from "./config/app-config"; import { acquireDesktopInstance } from "./desktop-instance"; -import { configureApplicationMenu } from "./desktop-menu"; +import { configureApplicationMenu, performDesktopAction } from "./desktop-menu"; import { createDesktopRpcHandler } from "./desktop-rpc"; import { LocalGameSettings } from "./game/local-settings"; import { RoomAiSettingsStore } from "./game/room-ai-settings"; @@ -228,6 +228,7 @@ export async function startDesktop(modulePath?: string, importUrl?: string): Pro const state = windowStates.get(window.id); if (state) state.gamePage = active; }, + windowAction: ({ action }) => performDesktopAction(window, action), }, messages: { orpc: (packet) => port?.receive(packet) }, }, diff --git a/apps/desktop/src/main/native-window.ts b/apps/desktop/src/main/native-window.ts index e2e65ed..e426fec 100644 --- a/apps/desktop/src/main/native-window.ts +++ b/apps/desktop/src/main/native-window.ts @@ -30,7 +30,7 @@ export function createDesktopWindow( const window = new BrowserWindow({ title: "TARP", frame: { width: 1280, height: 800 }, - titleBarStyle: process.platform === "darwin" ? "hiddenInset" : "default", + titleBarStyle: process.platform === "linux" ? "default" : "hiddenInset", trafficLightOffset: { x: 16, y: 16 }, renderer: "native", ...options, diff --git a/apps/desktop/src/renderer/src/components/WindowsTitleBar.tsx b/apps/desktop/src/renderer/src/components/WindowsTitleBar.tsx new file mode 100644 index 0000000..abaf8ce --- /dev/null +++ b/apps/desktop/src/renderer/src/components/WindowsTitleBar.tsx @@ -0,0 +1,71 @@ +import type { DesktopAction } from "@shared/desktop-events"; +import { Copy, Minus, Square, X } from "lucide-react"; +import { useEffect, useState, type ReactNode } from "react"; + +import { Button } from "./ui/button"; + +/** 独立占用一行,避免窗口按钮遮挡设置、模组和参考资料窗口的内容。 */ +export function WindowsTitleBar({ children }: { readonly children: ReactNode }) { + const [maximized, setMaximized] = useState(false); + const windows = navigator.userAgent.includes("Windows"); + async function action(command: DesktopAction) { + const state = await window.desktopEvents?.windowAction(command); + if (state !== undefined) setMaximized(state); + } + + useEffect(() => { + if (!windows) return; + const refresh = () => void action("window-state"); + refresh(); + window.addEventListener("resize", refresh); + return () => window.removeEventListener("resize", refresh); + }, [windows]); + + if (!windows) return children; + return ( +
+
{ + if (event.target instanceof Element && event.target.closest("button")) return; + void action("maximize"); + }} + > + + TARP + +
+
+ + + +
+
+
{children}
+
+ ); +} diff --git a/apps/desktop/src/renderer/src/main.tsx b/apps/desktop/src/renderer/src/main.tsx index c5d4bc0..adb4229 100644 --- a/apps/desktop/src/renderer/src/main.tsx +++ b/apps/desktop/src/renderer/src/main.tsx @@ -6,6 +6,7 @@ import ReactDOM from "react-dom/client"; import { SplashScreen } from "./components/SplashScreen"; import { ThemeProvider } from "./components/ThemeProvider"; import { TooltipProvider } from "./components/ui/tooltip"; +import { WindowsTitleBar } from "./components/WindowsTitleBar"; import { desktopRpc, queryClient } from "./desktop-rpc"; import { listenForModuleSync } from "./features/sessions/room-module-sync"; import { desktopReady } from "./native-bridge"; @@ -70,7 +71,9 @@ void Promise.all([ ReactDOM.createRoot(rootElement).render( - {content} + + {content} + , ); diff --git a/apps/desktop/src/renderer/src/native-bridge.ts b/apps/desktop/src/renderer/src/native-bridge.ts index daf5844..60f137b 100644 --- a/apps/desktop/src/renderer/src/native-bridge.ts +++ b/apps/desktop/src/renderer/src/native-bridge.ts @@ -1,3 +1,4 @@ +import { desktopShortcut } from "@shared/desktop-shortcuts"; import { setDocumentMediaBase } from "@shared/document-media"; import { NativeMessagePort, type NativeBridge } from "@shared/native-bridge"; import { Electroview } from "electrobun/view"; @@ -24,6 +25,7 @@ export const desktopReady = rpc.request.bootstrap().then(({ mediaBase }) => { setDocumentMediaBase(mediaBase); }); window.desktopEvents = { + windowAction: (action) => rpc.request.windowAction({ action }), claimStartupAnimation: () => rpc.request.claimStartupAnimation(), setGamePage: (active) => { void rpc.request.setGamePage({ active }); @@ -32,6 +34,16 @@ window.desktopEvents = { onRequestLeaveRoom: (listener) => listen("request-leave-room", listener), }; +if (navigator.userAgent.includes("Windows")) { + document.addEventListener("keydown", (event) => { + if (event.defaultPrevented || event.isComposing) return; + const action = desktopShortcut(event); + if (!action) return; + event.preventDefault(); + void rpc.request.windowAction({ action }); + }); +} + window.addEventListener("pagehide", () => nativePort.close(), { once: true }); document.addEventListener( "click", diff --git a/apps/desktop/src/shared/desktop-events.ts b/apps/desktop/src/shared/desktop-events.ts index 28914d7..aaee6ff 100644 --- a/apps/desktop/src/shared/desktop-events.ts +++ b/apps/desktop/src/shared/desktop-events.ts @@ -1,4 +1,19 @@ +export type DesktopAction = + | "minimize" + | "maximize" + | "close" + | "quit" + | "settings" + | "reset-zoom" + | "zoom-in" + | "zoom-out" + | "full-screen" + | "reload" + | "devtools" + | "window-state"; + export interface DesktopEvents { + windowAction(action: DesktopAction): Promise; claimStartupAnimation(): Promise; setGamePage(active: boolean): void; onRequestLeaveRoom(listener: () => void): () => void; diff --git a/apps/desktop/src/shared/desktop-shortcuts.test.ts b/apps/desktop/src/shared/desktop-shortcuts.test.ts new file mode 100644 index 0000000..7d9caae --- /dev/null +++ b/apps/desktop/src/shared/desktop-shortcuts.test.ts @@ -0,0 +1,27 @@ +import { expect, test } from "bun:test"; + +import { desktopShortcut } from "./desktop-shortcuts"; + +const key = (value: string, overrides = {}) => ({ + key: value, + ctrlKey: false, + altKey: false, + shiftKey: false, + metaKey: false, + ...overrides, +}); + +test("Windows 窗口快捷键支持主键盘与小键盘缩放,不拦截编辑与输入", () => { + expect(desktopShortcut(key("w", { ctrlKey: true }))).toBe("close"); + expect(desktopShortcut(key(",", { ctrlKey: true }))).toBe("settings"); + expect(desktopShortcut(key("+", { ctrlKey: true, shiftKey: true }))).toBe("zoom-in"); + expect(desktopShortcut(key("=", { ctrlKey: true }))).toBe("zoom-in"); + expect(desktopShortcut(key("F10"))).toBeUndefined(); + expect(desktopShortcut(key("F11"))).toBe("full-screen"); + for (const value of ["c", "v", "x", "a", "z"]) { + expect(desktopShortcut(key(value, { ctrlKey: true }))).toBeUndefined(); + } + expect(desktopShortcut(key("w"))).toBeUndefined(); + expect(desktopShortcut(key("w", { ctrlKey: true, altKey: true }))).toBeUndefined(); + expect(desktopShortcut(key("F10", { shiftKey: true }))).toBeUndefined(); +}); diff --git a/apps/desktop/src/shared/desktop-shortcuts.ts b/apps/desktop/src/shared/desktop-shortcuts.ts new file mode 100644 index 0000000..c06b6a5 --- /dev/null +++ b/apps/desktop/src/shared/desktop-shortcuts.ts @@ -0,0 +1,41 @@ +import type { DesktopAction } from "./desktop-events"; + +/** 文本编辑快捷键继续交给系统 WebView,仅接管窗口与应用动作。 */ +export function desktopShortcut(event: { + key: string; + ctrlKey: boolean; + altKey: boolean; + shiftKey: boolean; + metaKey: boolean; +}): DesktopAction | undefined { + if (event.metaKey) return; + if (event.ctrlKey && event.altKey && !event.shiftKey && event.key.toLowerCase() === "i") + return "devtools"; + if (event.altKey) return; + if (!event.ctrlKey) { + if (event.shiftKey) return; + if (event.key === "F11") return "full-screen"; + return; + } + const key = event.key.toLowerCase(); + if (event.shiftKey && key !== "+") return; + switch (key) { + case ",": + return "settings"; + case "w": + return "close"; + case "q": + return "quit"; + case "m": + return "minimize"; + case "r": + return "reload"; + case "0": + return "reset-zoom"; + case "+": + case "=": + return "zoom-in"; + case "-": + return "zoom-out"; + } +} diff --git a/apps/desktop/src/shared/native-bridge.ts b/apps/desktop/src/shared/native-bridge.ts index 5c011cb..0ecd678 100644 --- a/apps/desktop/src/shared/native-bridge.ts +++ b/apps/desktop/src/shared/native-bridge.ts @@ -1,3 +1,5 @@ +import type { DesktopAction } from "./desktop-events"; + export interface BridgePacket { binary: boolean; data: string; @@ -10,6 +12,7 @@ export type NativeBridge = { claimStartupAnimation: { params: undefined; response: boolean }; openExternal: { params: { url: string }; response: boolean }; setGamePage: { params: { active: boolean }; response: void }; + windowAction: { params: { action: DesktopAction }; response: boolean }; }; messages: { orpc: BridgePacket }; }; diff --git "a/docs/\346\241\214\351\235\242\345\256\277\344\270\273\345\256\236\347\216\260.md" "b/docs/\346\241\214\351\235\242\345\256\277\344\270\273\345\256\236\347\216\260.md" index 2e7b82c..95b8cc6 100644 --- "a/docs/\346\241\214\351\235\242\345\256\277\344\270\273\345\256\236\347\216\260.md" +++ "b/docs/\346\241\214\351\235\242\345\256\277\344\270\273\345\256\236\347\216\260.md" @@ -28,6 +28,8 @@ ## 平台边界 -macOS 使用 WKWebView,Windows 使用 WebView2,Linux 使用 WebKitGTK 4.1;不捆绑 CEF。不同引擎的布局、中文输入、音频设备解锁和媒体播放需要分别验收。页面主题由应用配置和 ThemeProvider 管理,系统窗口装饰跟随操作系统。 +macOS 使用 WKWebView,Windows 使用 WebView2,Linux 使用 WebKitGTK 4.1;不捆绑 CEF。不同引擎的布局、中文输入、音频设备解锁和媒体播放需要分别验收。页面主题由应用配置和 ThemeProvider 管理。Windows 使用 `hiddenInset` 保留原生缩放边框,由 `WindowsTitleBar` 绘制随页面主题变化的标题栏;macOS 保留原生交通灯,Linux 保留系统窗口装饰。 + +Windows 不注册传统应用菜单,也不提供折叠菜单入口;设置保留侧栏入口,缩放与全屏等操作通过窗口内快捷键处理。窗口按钮和应用快捷键通过绑定当前窗口的原生桥执行,编辑快捷键由 WebView 处理;关闭动作调用 `requestClose()`,必须经过现有 `will-close` 离房确认,不能改成直接销毁窗口的 `close()`。窗口拖动、贴边、双击缩放、最大化恢复、全屏和中文输入需在 Windows 实机验收。 当前官方未发布 macOS x64 core,因此发布矩阵为 macOS ARM64、Windows x64、Linux x64。安装格式和签名流程见[发布流程](发布流程.md)。 diff --git "a/docs/\347\225\214\351\235\242\350\256\276\350\256\241.md" "b/docs/\347\225\214\351\235\242\350\256\276\350\256\241.md" index 0239dee..0d94f7d 100644 --- "a/docs/\347\225\214\351\235\242\350\256\276\350\256\241.md" +++ "b/docs/\347\225\214\351\235\242\350\256\276\350\256\241.md" @@ -6,6 +6,8 @@ 三平台共用视觉规则,系统菜单、编辑快捷键和窗口操作遵循平台惯例。应用菜单由 Electrobun 提供,文本编辑右键菜单使用系统 WebView,业务操作菜单使用 Base UI。设置快捷键为 `CmdOrCtrl+,`,由主进程经过原生桥的单向事件打开当前窗口的设置层;没有窗口时从设置页重建主窗口,不注册系统全局快捷键。 +Windows 使用 36px 高的主题标题栏,左侧仅显示 TARP 品牌,不提供传统菜单栏或折叠菜单按钮;右侧保留最小化、最大化或还原、关闭按钮;关闭悬停使用系统习惯的红色。标题栏独立占据布局空间,模组、设置、对局和参考窗口共用,不遮挡正文与弹窗。标题区域可拖动与双击缩放,按钮排除在拖动区域之外;应用快捷键在窗口内处理,编辑快捷键继续交给 WebView。 + 主导航、对局视图、模组正文和设置分区直接切换内容,全屏设置直接打开与关闭,不使用正文淡入淡出或 View Transition 快照。切换时保留已有持久布局和已挂载内容状态;菜单选中背景共用 `components/NavigationMotion.tsx` 的 `NavigationMotion` 和 `NavigationHighlight`。 ## 交互反馈与表单