Simplify off-screen check

This commit is contained in:
TC
2022-01-22 19:57:23 +01:00
parent 199d8ba4d7
commit 89ea66ba2b

View File

@ -131,14 +131,21 @@ function createMainWindow() {
if (windowPosition) { if (windowPosition) {
const { x, y } = windowPosition; const { x, y } = windowPosition;
const winSize = win.getSize(); const winSize = win.getSize();
const displaySize = electron.screen.getDisplayNearestPoint(windowPosition).bounds; const displaySize =
if((x + winSize[0] < displaySize.x - 8 || x - winSize[0] > displaySize.x + displaySize.width) || electron.screen.getDisplayNearestPoint(windowPosition).bounds;
(y < displaySize.y - 8 || y > displaySize.y + displaySize.height)) { if (
x + winSize[0] < displaySize.x - 8 ||
x - winSize[0] > displaySize.x + displaySize.width ||
y < displaySize.y - 8 ||
y > displaySize.y + displaySize.height
) {
//Window is offscreen //Window is offscreen
if (is.dev()) { if (is.dev()) {
console.log(`Window tried to render offscreen, windowSize=${winSize}, displaySize=${displaySize}, position=${windowPosition}`); console.log(
`Window tried to render offscreen, windowSize=${winSize}, displaySize=${displaySize}, position=${windowPosition}`
);
} }
} else { } else {
win.setPosition(x, y); win.setPosition(x, y);
} }
} }