smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-11 18:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/refactor-plugin-system

Browse Source
This commit is contained in:
JellyBrick
2023-11-28 01:48:38 +09:00
committed by GitHub
parent bf33c4e7b4 738adbed98
commit 3f70d912d7
8 changed files with 306 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/index.ts
View File

@ -280,31 +280,42 @@ async function createMainWindow() {
await loadAllMainPlugins(win);
if (windowPosition) {
const { x: windowX, y: windowY } = windowPosition;
const winSize = win.getSize();
const displaySize = screen.getDisplayNearestPoint(windowPosition).bounds;
const display = screen.getDisplayNearestPoint(windowPosition);
const scaleFactor = display.scaleFactor;
const scaledWidth = Math.floor(windowSize.width / scaleFactor);
const scaledHeight = Math.floor(windowSize.height / scaleFactor);
const scaledX = windowX;
const scaledY = windowY;
if (
windowX + winSize[0] < displaySize.x - 8 ||
windowX - winSize[0] > displaySize.x + displaySize.width ||
windowY < displaySize.y - 8 ||
windowY > displaySize.y + displaySize.height
scaledX + scaledWidth < display.bounds.x - 8 ||
scaledX - scaledWidth > display.bounds.x + display.bounds.width ||
scaledY < display.bounds.y - 8 ||
scaledY > display.bounds.y + display.bounds.height
) {
// Window is offscreen
if (is.dev()) {
console.log(
`Window tried to render offscreen, windowSize=${String(
winSize,
)}, displaySize=${String(displaySize)}, position=${String(
)}, displaySize=${String(display.bounds)}, position=${String(
windowPosition,
)}`,
);
}
} else {
win.setPosition(windowX, windowY);
win.setSize(scaledWidth, scaledHeight);
win.setPosition(scaledX, scaledY);
}
}
if (windowMaximized) {
win.maximize();
}

4
src/plugins/discord/main.ts
View File

@ -9,8 +9,8 @@ import registerCallback, { type SongInfoCallback, type SongInfo } from '@/provid
import type { DiscordPluginConfig } from './index';
// Application ID registered by @Zo-Bro-23
const clientId = '1043858434585526382';
// Application ID registered by @th-ch/youtube-music dev team
const clientId = '1177081335727267940';
export interface Info {
rpc: DiscordClient;