Merge remote-tracking branch 'vesktop/main'

verticalsync · Apr 13, 2024 · 0693d80 · 0693d80
2 parents 96eab04 + 8c6941b
commit 0693d80
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "arrpc": "github:OpenAsar/arrpc#98879cae0565e6fce34e4cb6f544bf42c6a7e7c8"
     },
     "optionalDependencies": {
-        "@vencord/venmic": "^3.3.2"
+        "@vencord/venmic": "^3.3.3"
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts
@@ -73,6 +73,10 @@ const [addSettingsListener, removeSettingsListeners] = makeSettingsListenerHelpe
 const [addVencordSettingsListener, removeVencordSettingsListeners] = makeSettingsListenerHelpers(VencordSettings);
 
 function initTray(win: BrowserWindow) {
+    const onTrayClick = () => {
+        if (Settings.store.clickTrayToShowHide && win.isVisible()) win.hide();
+        else win.show();
+    };
     const trayMenu = Menu.buildFromTemplate([
         {
             label: "Open",
@@ -120,7 +124,7 @@ function initTray(win: BrowserWindow) {
     tray = new Tray(ICON_PATH);
     tray.setToolTip("Sunroof");
     tray.setContextMenu(trayMenu);
-    tray.on("click", () => win.show());
+    tray.on("click", onTrayClick);
 }
 
 async function clearData(win: BrowserWindow) {

diff --git a/src/renderer/components/settings/Settings.tsx b/src/renderer/components/settings/Settings.tsx
@@ -84,6 +84,12 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             invisible: () => isMac,
             disabled: () => Settings.store.tray === false
         },
+        {
+            key: "clickTrayToShowHide",
+            title: "Hide/Show on tray click",
+            description: "Left clicking tray icon will toggle the vesktop window visibility.",
+            defaultValue: false
+        },
         {
             key: "disableMinSize",
             title: "Disable minimum window size",

diff --git a/src/shared/settings.d.ts b/src/shared/settings.d.ts
@@ -20,7 +20,7 @@ export interface Settings {
     arRPC?: boolean;
     appBadge?: boolean;
     disableMinSize?: boolean;
-
+    clickTrayToShowHide?: boolean;
     /** @deprecated use customTitleBar */
     discordWindowsTitleBar?: boolean;
     customTitleBar?: boolean;