feat(compact mode): prevent user from resizing the window

zidoro · Dec 20, 2022 · dd69232 · dd69232
1 parent b142a47
commit dd69232
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 19 deletions.
diff --git a/app/main/src/helpers/globalShortcuts.ts b/app/main/src/helpers/globalShortcuts.ts
@@ -22,7 +22,7 @@ export function activateFullScreenShortcuts(
   );
 }
 
-export function deactivateFullScreenSchortcuts() {
+export function deactivateFullScreenShortcuts() {
   globalShortcut.unregister(EXIT_SHORTCUTS.ESCAPE);
   globalShortcut.unregister(EXIT_SHORTCUTS.QUIT);
 }
diff --git a/app/main/src/lifecycleEventHandlers/__tests__/fullScreenBreak.test.ts b/app/main/src/lifecycleEventHandlers/__tests__/fullScreenBreak.test.ts
@@ -48,7 +48,7 @@ describe("Fullscreen break", () => {
       {
         win: window,
         contextMenu: Menu.buildFromTemplate([{ label: "Mock Label" }]),
-        fullscreenState,
+        isFullscreen: fullscreenState.isFullscreen,
         trayTooltip,
         tray,
       }
@@ -105,7 +105,7 @@ describe("Fullscreen break", () => {
       {
         win: window,
         contextMenu: Menu.buildFromTemplate([{ label: "Mock Label" }]),
-        fullscreenState,
+        isFullscreen: fullscreenState.isFullscreen,
         trayTooltip,
         tray,
       }

diff --git a/app/main/src/lifecycleEventHandlers/fullScreenBreak.ts b/app/main/src/lifecycleEventHandlers/fullScreenBreak.ts
@@ -1,6 +1,6 @@
 import {
   activateFullScreenShortcuts,
-  deactivateFullScreenSchortcuts,
+  deactivateFullScreenShortcuts,
 } from "../helpers";
 import { BrowserWindow, Menu, Tray } from "electron";
 
@@ -18,14 +18,14 @@ type AppArgs = {
   trayTooltip: string;
   win: BrowserWindow | null;
   contextMenu: Menu;
-  fullscreenState: FullscreenState;
+  isFullscreen: FullscreenState["isFullscreen"];
 };
 
 const setFullScreen = (
   flag: boolean,
   alwaysOnTop: boolean,
   win: BrowserWindow | null,
-  fullscreenState: FullscreenState
+  isFullscreen: FullscreenState["isFullscreen"]
 ) => {
   win?.setFullScreenable(true);
   win?.setAlwaysOnTop(alwaysOnTop, "screen-saver");
@@ -34,7 +34,7 @@ const setFullScreen = (
   win?.show();
   win?.focus();
 
-  fullscreenState.isFullscreen = flag;
+  isFullscreen = flag;
 };
 
 /**
@@ -48,11 +48,10 @@ export const setFullscreenBreakHandler = (
   appArgs: AppArgs
 ) => {
   const { shouldFullscreen, alwaysOnTop } = fullscreenArgs;
-  const { tray, trayTooltip, win, contextMenu, fullscreenState } =
-    appArgs;
+  const { tray, trayTooltip, win, contextMenu, isFullscreen } = appArgs;
 
   if (shouldFullscreen) {
-    setFullScreen(true, alwaysOnTop, win, fullscreenState);
+    setFullScreen(true, alwaysOnTop, win, isFullscreen);
 
     activateFullScreenShortcuts(() => {});
 
@@ -65,9 +64,9 @@ export const setFullscreenBreakHandler = (
       ])
     );
   } else {
-    setFullScreen(false, alwaysOnTop, win, fullscreenState);
+    setFullScreen(false, alwaysOnTop, win, isFullscreen);
 
-    deactivateFullScreenSchortcuts();
+    deactivateFullScreenShortcuts();
     tray?.setToolTip(trayTooltip);
     tray?.setContextMenu(contextMenu);
   }

diff --git a/app/main/src/main.ts b/app/main/src/main.ts
@@ -51,7 +51,7 @@ const notificationIcon = path.join(
 
 const trayIcon = path.join(__dirname, "./assets/tray-dark.png");
 
-const onlySingleIntance = app.requestSingleInstanceLock();
+const onlySingleInstance = app.requestSingleInstanceLock();
 
 Menu.setApplicationMenu(null);
 
@@ -70,7 +70,14 @@ let tray: Tray | null = null;
 
 let win: BrowserWindow | null;
 
-const fullscreenState: FullscreenState = { isFullscreen: false };
+type WindowStateProps = {
+  isOnCompactMode: boolean;
+} & FullscreenState;
+
+const windowState: WindowStateProps = {
+  isFullscreen: false,
+  isOnCompactMode: false,
+};
 
 function createMainWindow() {
   win = new BrowserWindow({
@@ -115,7 +122,7 @@ function createMainWindow() {
           if (win) {
             const data = await getFromStorage(win, "state");
             if (data.settings.minimizeToTray) {
-              if (!fullscreenState.isFullscreen) {
+              if (!windowState.isFullscreen) {
                 win?.hide();
                 if (tray === null && data.settings.minimizeToTray) {
                   createSystemTray();
@@ -132,6 +139,15 @@ function createMainWindow() {
     )
   );
 
+  win.on("leave-full-screen", () => {
+    // This is a workaround of resize issue after leaving the full screen mode.
+    if (windowState.isOnCompactMode) {
+      win?.setSize(340, 100);
+    } else {
+      win?.setSize(340, getFrameHeight());
+    }
+  });
+
   win.on(
     "close",
     debounce(
@@ -143,7 +159,7 @@ function createMainWindow() {
             if (!data.settings.closeToTray) {
               app.exit();
             } else {
-              if (!fullscreenState.isFullscreen) {
+              if (!windowState.isFullscreen) {
                 win?.hide();
                 if (tray === null && data.settings.closeToTray) {
                   createSystemTray();
@@ -201,7 +217,7 @@ function createSystemTray() {
   });
 }
 
-if (!onlySingleIntance) {
+if (!onlySingleInstance) {
   app.quit();
 } else {
   app.on("second-instance", () => {
@@ -307,21 +323,25 @@ ipcMain.on(SET_ALWAYS_ON_TOP, (e, { alwaysOnTop }) => {
 
 ipcMain.on(SET_FULLSCREEN_BREAK, (e, args) => {
   setFullscreenBreakHandler(args, {
+    win,
     tray,
     trayTooltip,
-    fullscreenState,
-    win,
     contextMenu,
+    isFullscreen: windowState.isFullscreen,
   });
 });
 
 ipcMain.on(SET_COMPACT_MODE, (e, args) => {
   if (args.compactMode) {
     win?.setMinimumSize(340, 100);
     win?.setSize(340, 100);
+    win?.setResizable(false);
+    windowState.isOnCompactMode = true;
   } else {
     win?.setMinimumSize(340, getFrameHeight());
     win?.setSize(340, getFrameHeight());
+    win?.setResizable(true);
+    windowState.isOnCompactMode = true;
   }
 });