chore: toggle instead of just display

Leksat · Mar 13, 2021 · 3272600 · 3272600
1 parent ebbe735
commit 3272600
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/src/main/app.ts b/src/main/app.ts
@@ -18,10 +18,14 @@ export const app = {
   window: {} as BrowserWindow,
   store,
 
-  showWindow: (): void => {
-    app.window.show();
-    app.window.focus();
-    app.focusToTextarea();
+  toggleWindow: (): void => {
+    if (app.window.isVisible()) {
+      app.electronApp.hide();
+    } else {
+      app.window.show();
+      app.window.focus();
+      app.focusToTextarea();
+    }
   },
 
   getTicketWithError: (): string => {

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -39,7 +39,7 @@ electronApp.on('ready', () => {
   app.window.on('close', (event) => {
     if (!shouldQuit) {
       event.preventDefault();
-      app.window.hide();
+      app.electronApp.hide();
     }
   });
 

diff --git a/src/main/shortcuts.ts b/src/main/shortcuts.ts
@@ -12,7 +12,7 @@ export const registerShortcuts = (app: App): void => {
         const ticket = app.getTicketWithError();
         app.addNewEntry(ticket);
       } else {
-        app.showWindow();
+        app.toggleWindow();
       }
       lastHitNewEntry = now;
     })
@@ -21,8 +21,8 @@ export const registerShortcuts = (app: App): void => {
   }
 
   if (
-    !globalShortcut.register(app.store.get('shortcuts').displayWindow, () => {
-      app.showWindow();
+    !globalShortcut.register(app.store.get('shortcuts').toggleWindow, () => {
+      app.toggleWindow();
     })
   ) {
     app.electronApp.exit(1);

diff --git a/src/main/tray.ts b/src/main/tray.ts
@@ -13,13 +13,13 @@ export const createTray = (app: App): void => {
   const contextMenu = Menu.buildFromTemplate([
     {
       label: 'Show window',
-      click: () => app.showWindow(),
+      click: () => app.toggleWindow(),
     },
     {
       label: 'New...',
       click: () => {
         app.addNewEntry('');
-        app.showWindow();
+        app.toggleWindow();
       },
     },
     {
@@ -34,7 +34,7 @@ export const createTray = (app: App): void => {
       click: () => {
         const ticket = app.getTicketWithError();
         app.addNewEntry(ticket);
-        app.showWindow();
+        app.toggleWindow();
       },
     },
     {

diff --git a/src/renderer/Settings.tsx b/src/renderer/Settings.tsx
@@ -18,7 +18,7 @@ export const Settings: React.FC<Props> = ({ close }) => {
         });
         store.set('shortcuts', {
           newEntry: data.get('shortcuts.newEntry') as string,
-          displayWindow: data.get('shortcuts.displayWindow') as string,
+          toggleWindow: data.get('shortcuts.toggleWindow') as string,
         });
         close();
       }}
@@ -47,10 +47,10 @@ export const Settings: React.FC<Props> = ({ close }) => {
         />
       </label>
       <label>
-        Shortcut display window
+        Shortcut toggle window
         <input
-          name="shortcuts.displayWindow"
-          defaultValue={store.get('shortcuts').displayWindow}
+          name="shortcuts.toggleWindow"
+          defaultValue={store.get('shortcuts').toggleWindow}
         />
       </label>
       <button onClick={close}>Close</button>

diff --git a/src/shared/state.ts b/src/shared/state.ts
@@ -11,7 +11,7 @@ export interface State {
   };
   shortcuts: {
     newEntry: string;
-    displayWindow: string;
+    toggleWindow: string;
   };
 }
 
@@ -28,6 +28,6 @@ export const defaults: State = {
   },
   shortcuts: {
     newEntry: 'CommandOrControl+Alt+V',
-    displayWindow: 'CommandOrControl+Alt+X',
+    toggleWindow: 'CommandOrControl+Alt+X',
   },
 };