Persist maximized state and handle title bar double-click (#1270)

Co-authored-by: Sindre Sorhus <[email protected]>

source/browser.ts

@@ -581,6 +581,20 @@ document.addEventListener('DOMContentLoaded', async () => {
 	toggleVideoAutoplay();
 });
 
+// Handle title bar double-click.
+window.addEventListener('dblclick', (event: Event) => {
+	const target = event.target as HTMLElement;
+	const titleBar = target.closest('._36ic._5l-3,._5742,._6-xk,._673w');
+
+	if (!titleBar) {
+		return;
+	}
+
+	ipc.callMain('titlebar-doubleclick');
+}, {
+	passive: true
+});
+
 window.addEventListener('load', () => {
 	if (location.pathname.startsWith('/login')) {
 		const keepMeSignedInCheckbox = document.querySelector<HTMLInputElement>('#u_0_0')!;

source/config.ts

@@ -13,6 +13,7 @@ type StoreType = {
 		y: number;
 		width: number;
 		height: number;
+		isMaximized: boolean;
 	};
 	menuBarMode: boolean;
 	showDockIcon: boolean;
@@ -83,13 +84,17 @@ const schema: {[Key in keyof StoreType]: Store.Schema} = {
 			},
 			height: {
 				type: 'number'
+			},
+			isMaximized: {
+				type: 'boolean'
 			}
 		},
 		default: {
 			x: undefined,
 			y: undefined,
 			width: 800,
-			height: 600
+			height: 600,
+			isMaximized: false
 		}
 	},
 	menuBarMode: {

source/index.ts

@@ -9,7 +9,8 @@ import {
 	BrowserWindow,
 	Menu,
 	Notification,
-	MenuItemConstructorOptions
+	MenuItemConstructorOptions,
+	systemPreferences
 } from 'electron';
 import {ipcMain} from 'electron-better-ipc';
 import log from 'electron-log';
@@ -358,7 +359,18 @@ function createMainWindow(): BrowserWindow {
 	});
 
 	win.on('resize', () => {
-		config.set('lastWindowState', win.getNormalBounds());
+		const {isMaximized} = config.get('lastWindowState');
+		config.set('lastWindowState', {...win.getNormalBounds(), isMaximized});
+	});
+
+	win.on('maximize', () => {
+		// @ts-ignore
+		config.set('lastWindowState.isMaximized', true);
+	});
+
+	win.on('unmaximize', () => {
+		// @ts-ignore
+		config.set('lastWindowState.isMaximized', false);
 	});
 
 	return win;
@@ -455,6 +467,10 @@ function createMainWindow(): BrowserWindow {
 			mainWindow.hide();
 			tray.create(mainWindow);
 		} else {
+			if (config.get('lastWindowState').isMaximized) {
+				mainWindow.maximize();
+			}
+
 			mainWindow.show();
 		}
 
@@ -552,6 +568,28 @@ if (is.macos) {
 	});
 }
 
+function toggleMaximized(): void {
+	if (mainWindow.isMaximized()) {
+		mainWindow.unmaximize();
+	} else {
+		mainWindow.maximize();
+	}
+}
+
+ipcMain.answerRenderer('titlebar-doubleclick', () => {
+	if (is.macos) {
+		const doubleClickAction = systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
+
+		if (doubleClickAction === 'Minimize') {
+			mainWindow.minimize();
+		} else if (doubleClickAction === 'Maximize') {
+			toggleMaximized();
+		}
+	} else {
+		toggleMaximized();
+	}
+});
+
 app.on('activate', () => {
 	if (mainWindow) {
 		mainWindow.show();
@@ -564,7 +602,8 @@ app.on('before-quit', () => {
 	// Checking whether the window exists to work around an Electron race issue:
 	// https://github.com/sindresorhus/caprine/issues/809
 	if (mainWindow) {
-		config.set('lastWindowState', mainWindow.getNormalBounds());
+		const {isMaximized} = config.get('lastWindowState');
+		config.set('lastWindowState', {...mainWindow.getNormalBounds(), isMaximized});
 	}
 });
 

source/tray.ts

@@ -19,7 +19,12 @@ export default {
 			if (win.isVisible()) {
 				win.hide();
 			} else {
-				win.show();
+				if (config.get('lastWindowState').isMaximized) {
+					win.maximize();
+					win.focus();
+				} else {
+					win.show();
+				}
 
 				// Workaround for https://github.com/electron/electron/issues/20858
 				// `setAlwaysOnTop` stops working after hiding the window on KDE Plasma.