Skip to content

feat: 优化窗口管理、 IPC 处理逻辑和在 macOS 下的窗口关闭、隐藏与退出逻辑 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LarryZhu-dev merged 2 commits into from
Mar 2, 2026
Merged

feat: 优化窗口管理、 IPC 处理逻辑和在 macOS 下的窗口关闭、隐藏与退出逻辑 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ffc21a
feat: 优化窗口管理和 IPC 处理，确保安全获取可用窗口不发生报错
wxfengg Feb 28, 2026
2c420bf
feat: 优化在 macOS 下的窗口关闭、隐藏与退出逻辑
wxfengg Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 60 additions & 40 deletions src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { cleanupProtocolUrls, detectFileTraits, normalizeMarkdown } from "./file
import {
close,
getIsQuitting,
isWindowClosing,
setIsQuitting,
registerGlobalIpcHandlers,
registerIpcHandleHandlers,
registerIpcOnHandlers,
Expand All @@ -13,11 +15,18 @@ import createMenu from "./menu";
import { setupUpdateHandlers } from "./update";
import { trackWindow } from "./windowManager";

let win: BrowserWindow;
let win: BrowserWindow | null = null;
let themeEditorWindow: BrowserWindow | null = null;
let isRendererReady = false;
let pendingStartupFile: string | null = null;

/** 安全获取一个可用的编辑器窗口（优先主窗口，回退到任意存活窗口） */
function getAvailableWindow(): BrowserWindow | null {
if (win && !win.isDestroyed()) return win;
const allWindows = BrowserWindow.getAllWindows().filter((w) => !w.isDestroyed());
Copy link

Copilot AI Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getAvailableWindow() 会回退到 BrowserWindow.getAllWindows() 的第一个窗口，这可能把主题编辑器窗口等非“编辑器窗口”选中，导致诸如 open-file-at-launch / DevTools / second-instance focus 等操作发到错误窗口。建议改为基于 windowManager 的 getMainWindow()/getEditorWindows() 选择目标（或至少排除 themeEditorWindow），以保证语义与注释一致且行为稳定。

Suggested change
const allWindows = BrowserWindow.getAllWindows().filter((w) => !w.isDestroyed());
const allWindows = BrowserWindow.getAllWindows().filter(
(w) => !w.isDestroyed() && w !== themeEditorWindow,
);

Copilot uses AI. Check for mistakes.
return allWindows[0] ?? null;
}

async function createWindow() {
win = new BrowserWindow({
width: 1200,
Expand All @@ -40,15 +49,11 @@ async function createWindow() {
trackWindow(win, true);

globalShortcut.register("CommandOrControl+Shift+I", () => {
if (win) win.webContents.openDevTools();
const targetWin = getAvailableWindow();
if (targetWin) targetWin.webContents.openDevTools();
});

// 注册 IPC 处理程序 (在加载页面前注册，防止竞态条件)
registerIpcOnHandlers(win);
registerIpcHandleHandlers(win);
setupUpdateHandlers(win);

createMenu(win);
createMenu();

// 处理外部链接跳转（target="_blank" 或 window.open）
win.webContents.setWindowOpenHandler(({ url }) => {
Expand Down Expand Up @@ -81,6 +86,14 @@ async function createWindow() {
if (process.env.VITE_DEV_SERVER_URL) {
win.webContents.openDevTools();
}

// macOS: 窗口关闭时如果不是退出流程且不是主动关闭，只隐藏而不关闭
win.on("close", (event) => {
if (process.platform === "darwin" && !getIsQuitting() && !isWindowClosing(win!.id)) {
event.preventDefault();
win?.webContents.send("close");
}
});
}

// 创建主题编辑器窗口
Expand All @@ -95,7 +108,7 @@ export async function createThemeEditorWindow() {
height: 700,
minWidth: 800,
minHeight: 600,
parent: win,
parent: getAvailableWindow() ?? undefined,
modal: false,
frame: false,
titleBarStyle: "hidden",
Expand Down Expand Up @@ -168,8 +181,9 @@ function sendFileToRenderer(filePath: string) {

// 发送到渲染进程的函数
const sendFile = () => {
if (win && win.webContents) {
win.webContents.send("open-file-at-launch", {
const targetWin = getAvailableWindow();
if (targetWin) {
targetWin.webContents.send("open-file-at-launch", {
filePath,
content,
fileTraits,
Expand Down Expand Up @@ -207,7 +221,11 @@ protocol.registerSchemesAsPrivileged([
]);

app.whenReady().then(async () => {
// 注册所有 IPC 处理程序（只注册一次，防止重复注册报错）
registerGlobalIpcHandlers();
registerIpcOnHandlers();
registerIpcHandleHandlers();
setupUpdateHandlers();

// 注册自定义协议处理器（仅用于兼容旧版本残留的 milkup:// URL）
// 新版本使用 file:// 协议直接加载本地图片
Expand Down Expand Up @@ -261,19 +279,7 @@ app.whenReady().then(async () => {

await createWindow();

// createMenu(win) // Moved to createWindow
// registerIpcOnHandlers(win) // Moved to createWindow
// registerIpcHandleHandlers(win) // Moved to createWindow
// setupUpdateHandlers(win) // Moved to createWindow

sendLaunchFileIfExists();

win.on("close", (event) => {
if (process.platform === "darwin" && !getIsQuitting()) {
event.preventDefault();
win.webContents.send("close");
}
});
});

// 单实例锁
Expand All @@ -283,12 +289,13 @@ if (!gotTheLock) {
app.quit();
} else {
app.on("second-instance", (_event, argv) => {
if (win) {
if (win.isMinimized()) win.restore();
win.focus();
// 处理通过命令行传入的文件路径
sendLaunchFileIfExists(argv);
const targetWin = getAvailableWindow();
if (targetWin) {
if (targetWin.isMinimized()) targetWin.restore();
targetWin.focus();
}
// 处理通过命令行传入的文件路径
sendLaunchFileIfExists(argv);
});
}
// macOS 专用：Finder 打开文件时触发
Expand All @@ -297,11 +304,20 @@ app.on("open-file", (event, filePath) => {
event.preventDefault();
sendFileToRenderer(filePath);
});
// 处理应用即将退出事件（包括右键 Dock 图标的退出）
// 处理应用即将退出事件（包括右键 Dock 图标的退出、Cmd+Q）
app.on("before-quit", (event) => {
if (process.platform === "darwin" && !getIsQuitting()) {
event.preventDefault();
close(win);
// 防止重入：close() / close:discard 中的 app.quit() 会再次触发 before-quit
if (getIsQuitting()) return;

// 标记正在退出，让窗口 close 事件不再拦截
setIsQuitting(true);

if (process.platform === "darwin") {
const targetWin = getAvailableWindow();
if (targetWin) {
event.preventDefault();
close(targetWin);
}
}
});

Expand All @@ -311,18 +327,22 @@ app.on("window-all-closed", () => {
}
});

// macOS 上处理应用激活事件
// macOS 上处理应用激活事件（点击 Dock 图标）
app.on("activate", () => {
// 重置退出标记：用户重新激活应用说明不想退出
setIsQuitting(false);

if (BrowserWindow.getAllWindows().length === 0) {
createWindow();
} else {
// 如果窗口存在但被隐藏，则显示它
if (win && !win.isVisible()) {
win.show();
}
// 将窗口置于前台
if (win) {
win.focus();
const targetWin = getAvailableWindow();
if (targetWin) {
// 如果窗口存在但被隐藏，则显示它
if (!targetWin.isVisible()) {
targetWin.show();
}
// 将窗口置于前台
targetWin.focus();
}
}
});
Loading