Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/9128

Browse source
This commit is contained in:
Vanessa 2023-09-16 19:30:21 +08:00
parent 2b62c9612d
commit eca0196bea
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/electron/main.js
View file

@ -723,6 +723,12 @@ app.whenReady().then(() => {
win.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron " + win.webContents.userAgent;
win.webContents.session.setSpellCheckerLanguages(["en-US"]);
win.loadURL(data.url);
win.on("close", (event) => {
if (win && !win.isDestroyed()) {
win.webContents.send("siyuan-save-close");
}
event.preventDefault();
});
const targetScreen = screen.getDisplayNearestPoint(screen.getCursorScreenPoint());
if (mainScreen.id !== targetScreen.id) {
win.setBounds(targetScreen.workArea);

11
app/src/boot/onGetConfig.ts
View file

@ -28,6 +28,7 @@ import {getIdFromSYProtocol, isSYProtocol} from "../util/pathName";
import {App} from "../index";
import {initWindowEvent} from "./globalEvent/event";
import {sendGlobalShortcut} from "./globalEvent/keydown";
import {closeWindow} from "../window/closeWin";
const matchKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => {
if (key1 === "general") {
@ -297,10 +298,14 @@ export const initWindow = (app: App) => {
return;
}
});
ipcRenderer.on(Constants.SIYUAN_SAVE_CLOSE, (event, close) => {
winOnClose(currentWindow, close);
});
}
ipcRenderer.on(Constants.SIYUAN_SAVE_CLOSE, (event, close) => {
if (isWindow()) {
closeWindow(app);
} else {
winOnClose(currentWindow, close);
}
});
ipcRenderer.on(Constants.SIYUAN_SEND_WINDOWS, (e, ipcData: IWebSocketData) => {
onWindowsMsg(ipcData);
});

3
app/src/layout/Wnd.ts
View file

@ -36,6 +36,7 @@ import {focusByOffset, getSelectionOffset} from "../protyle/util/selection";
import {Custom} from "./dock/Custom";
import {App} from "../index";
import {unicode2Emoji} from "../emoji";
import {closeWindow} from "../window/closeWin";
export class Wnd {
private app: App;
@ -775,7 +776,7 @@ export class Wnd {
if (!wnd) {
/// #if !BROWSER
if (isWindow()) {
getCurrentWindow().destroy();
closeWindow(this.app);
return;
}
/// #endif