mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-16 20:52:06 +00:00
fix: prevent name shadowing
This commit is contained in:
14
index.ts
14
index.ts
@ -236,15 +236,15 @@ function createMainWindow() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (windowPosition) {
|
if (windowPosition) {
|
||||||
const { x, y } = windowPosition;
|
const { x: windowX, y: windowY } = windowPosition;
|
||||||
const winSize = win.getSize();
|
const winSize = win.getSize();
|
||||||
const displaySize
|
const displaySize
|
||||||
= screen.getDisplayNearestPoint(windowPosition).bounds;
|
= screen.getDisplayNearestPoint(windowPosition).bounds;
|
||||||
if (
|
if (
|
||||||
x + winSize[0] < displaySize.x - 8
|
windowX + winSize[0] < displaySize.x - 8
|
||||||
|| x - winSize[0] > displaySize.x + displaySize.width
|
|| windowX - winSize[0] > displaySize.x + displaySize.width
|
||||||
|| y < displaySize.y - 8
|
|| windowY < displaySize.y - 8
|
||||||
|| y > displaySize.y + displaySize.height
|
|| windowY > displaySize.y + displaySize.height
|
||||||
) {
|
) {
|
||||||
// Window is offscreen
|
// Window is offscreen
|
||||||
if (is.dev()) {
|
if (is.dev()) {
|
||||||
@ -254,8 +254,8 @@ function createMainWindow() {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const scaledPosition = {
|
const scaledPosition = {
|
||||||
x: windowPosition.x / scaleFactor,
|
x: windowX / scaleFactor,
|
||||||
y: windowPosition.y / scaleFactor,
|
y: windowY / scaleFactor,
|
||||||
};
|
};
|
||||||
win.setPosition(scaledPosition.x, scaledPosition.y);
|
win.setPosition(scaledPosition.x, scaledPosition.y);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user