From 7592f0be213c4598bcef0b2b8077e6d345c13503 Mon Sep 17 00:00:00 2001 From: khcrysalis <97859147+khcrysalis@users.noreply.github.com> Date: Sat, 14 Sep 2024 15:40:53 -0700 Subject: [PATCH] fix: Try to make github actions test happy --- src/main/mainWindow.ts | 7 ++++--- src/renderer/components/settings/Settings.tsx | 2 +- src/renderer/components/settings/TitleBarPicker.tsx | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 52c73c1..864f9ac 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -424,15 +424,16 @@ function createMainWindow() { transparencyOption !== "none" && { transparent: true }), - ...(staticTitle && { title: "Vesktop" }), ...(process.platform === "darwin" && titleBar !== "shown" && getDarwinOptions()), // Show/Hide titlebar depending on settings on Mac ...getWindowBoundsOptions(), autoHideMenuBar: enableMenu })); win.setMenuBarVisibility(false); - if (process.platform === "darwin" && titleBar === "custom") { win.setWindowButtonVisibility(false); } // Hide the traffic lights - + if (process.platform === "darwin" && titleBar === "custom") { + win.setWindowButtonVisibility(false); // Hide the traffic lights + } + win.on("close", e => { const useTray = !isDeckGameMode && Settings.store.minimizeToTray !== false && Settings.store.tray !== false; if (isQuitting || (process.platform !== "darwin" && !useTray)) return; diff --git a/src/renderer/components/settings/Settings.tsx b/src/renderer/components/settings/Settings.tsx index 196d006..20a056d 100644 --- a/src/renderer/components/settings/Settings.tsx +++ b/src/renderer/components/settings/Settings.tsx @@ -55,7 +55,7 @@ const SettingsOptions: Record> defaultValue: false, invisible: () => isMac, disabled: () => Settings.store.titleBar === "custom" ?? isWindows - }, + } ], "User Interface": [ { diff --git a/src/renderer/components/settings/TitleBarPicker.tsx b/src/renderer/components/settings/TitleBarPicker.tsx index 1db2971..1fcdeac 100644 --- a/src/renderer/components/settings/TitleBarPicker.tsx +++ b/src/renderer/components/settings/TitleBarPicker.tsx @@ -16,6 +16,7 @@ export const TitleBarPicker: SettingsComponent = ({ settings }) => { Customize apps title bar. Pick Discord if you want to use Discord's custom title bar. Requires a full restart +