Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add arg to ignore splash window #820

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+16 −8
Open

Add arg to ignore splash window #820

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8f847e
Add arg to ignore splash window
mytdragon Aug 19, 2024
422c8af
Revert changes to pnpm-lock.yaml
mytdragon Aug 19, 2024
f53f870
Show main window earlier & adapt to splash colours
Covkie Aug 20, 2024
c293c8e
Merge branch 'main' into feature-no-splash
Covkie Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/main/mainWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ function initSpellCheck(win: BrowserWindow) {
initSpellCheckLanguages(win, Settings.store.spellCheckLanguages);
}

function createMainWindow() {
function createMainWindow(splash: boolean) {
// Clear up previous settings listeners
removeSettingsListeners();
removeVencordSettingsListeners();
Expand All @@ -395,8 +395,10 @@ function createMainWindow() {

const noFrame = frameless === true || customTitleBar === true;

const { splashBackground, splashTheming } = Settings.store;
const win = (mainWin = new BrowserWindow({
show: false,
show: splash,
backgroundColor: splashTheming ? splashBackground : "#313338",
webPreferences: {
nodeIntegration: false,
sandbox: false,
Expand Down Expand Up @@ -469,19 +471,25 @@ const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDeskto

export async function createWindows() {
const startMinimized = process.argv.includes("--start-minimized");
const splash = createSplashWindow(startMinimized);
// SteamOS letterboxes and scales it terribly, so just full screen it
if (isDeckGameMode) splash.setFullScreen(true);
const noSplash = process.argv.includes("--no-splash");
let splash;
if (!noSplash) {
splash = createSplashWindow(startMinimized);
// SteamOS letterboxes and scales it terribly, so just full screen it
if (isDeckGameMode) splash.setFullScreen(true);
}
await ensureVencordFiles();
runVencordMain();

mainWin = createMainWindow();
mainWin = createMainWindow(noSplash);

mainWin.webContents.on("did-finish-load", () => {
splash.destroy();
if (splash) {
splash.destroy();
}

if (!startMinimized) {
mainWin!.show();
if (!noSplash) mainWin!.show();
if (State.store.maximized && !isDeckGameMode) mainWin!.maximize();
}

Expand Down