github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-20 11:00:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-05-17 10:20:29 +08:00
commit ca6833bb02
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/electron/main.js
View File

@ -268,8 +268,9 @@ const initMainWindow = () => {
height: defaultHeight, height: defaultHeight,
}, oldWindowState); }, oldWindowState);
// writeLog("windowStat [width=" + windowState.width + ", height=" + windowState.height + "], default [width=" + defaultWidth + ", height=" + defaultHeight + "], workArea [width=" + workArea.width + ", height=" + workArea.height + "]"); writeLog("windowStat [x=" + windowState.x + ", y=" + windowState.y + ", width=" + windowState.width + ", height=" + windowState.height + "], default [width=" + defaultWidth + ", height=" + defaultHeight + "], workArea [width=" + workArea.width + ", height=" + workArea.height + "]");
let resetToCenter = false
let x = windowState.x; let x = windowState.x;
let y = windowState.y; let y = windowState.y;
if (workArea) { if (workArea) {
@ -278,25 +279,22 @@ const initMainWindow = () => {
windowState.width = Math.min(defaultWidth, workArea.width); windowState.width = Math.min(defaultWidth, workArea.width);
windowState.height = Math.min(defaultHeight, workArea.height); windowState.height = Math.min(defaultHeight, workArea.height);
} }
if (x >= workArea.width * 0.8) {
x = 0; if (x >= workArea.width * 0.8 || y >= workArea.height * 0.8) {
} resetToCenter = true;
if (y >= workArea.height * 0.8) {
y = 0;
} }
} }
if (x < 0 || y < 0) {
resetToCenter = true;
}
if (windowState.width < 493) { if (windowState.width < 493) {
windowState.width = 493; windowState.width = 493;
} }
if (windowState.height < 376) { if (windowState.height < 376) {
windowState.height = 376; windowState.height = 376;
} }
if (x < 0) {
x = 0;
}
if (y < 0) {
y = 0;
}
// 创建主窗体 // 创建主窗体
const currentWindow = new BrowserWindow({ const currentWindow = new BrowserWindow({
@ -321,7 +319,7 @@ const initMainWindow = () => {
}); });
remote.enable(currentWindow.webContents); remote.enable(currentWindow.webContents);
windowStateInitialized ? currentWindow.setPosition(x, y) : currentWindow.center(); resetToCenter ? currentWindow.center() : currentWindow.setPosition(x, y);
currentWindow.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron " + currentWindow.webContents.userAgent; currentWindow.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron " + currentWindow.webContents.userAgent;
// set proxy // set proxy