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

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

Browse source
This commit is contained in:
Vanessa 2023-02-26 10:19:47 +08:00
parent 91096274c7
commit c8e64a8bbb
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/electron/main.js
View file

@ -736,12 +736,15 @@ app.whenReady().then(() => {
}
});
ipcMain.on("siyuan-openwindow", (event, data) => {
const mainWindow = BrowserWindow.fromId(data.id);
const mainBounds = mainWindow.getBounds();
const mainScreen = screen.getDisplayNearestPoint({x: mainBounds.x, y: mainBounds.y});
const win = new BrowserWindow({
show: true,
backgroundColor: "#FFF",
trafficLightPosition: {x: 8, y: 13},
width: screen.getPrimaryDisplay().size.width * 0.7,
height: screen.getPrimaryDisplay().size.height * 0.9,
width: mainScreen.size.width * 0.7,
height: mainScreen.size.height * 0.9,
minWidth: 493,
minHeight: 376,
fullscreenable: true,
@ -755,7 +758,11 @@ app.whenReady().then(() => {
webSecurity: false,
},
});
win.loadURL(data);
win.loadURL(data.url);
const targetScreen = screen.getDisplayNearestPoint(screen.getCursorScreenPoint())
if (mainScreen.id !== targetScreen.id) {
win.setBounds(targetScreen.workArea)
}
require("@electron/remote/main").enable(win.webContents);
});
ipcMain.on("siyuan-open-workspace", (event, data) => {