Preferences: Support window.zoomLevel Preference

Fixes eclipse-theia#8751 What it does - Adds support to specify window zoom level as a preference How to test 1. Open `Preferences` view and locate the `window.zoomLevel` preference 2. Enter in a custom value or change the zoom level using ctrl + / - / 0 3. Observe that the zoom level preference is updated 4. Reload the window and observe that the preferred zoom level is preserved Signed-off-by: seantan22 <[email protected]>
seantan22 · Feb 18, 2021 · 694668f · 694668f
1 parent 4e1c1d4
commit 694668f
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 6 deletions.
diff --git a/packages/core/src/electron-browser/menu/electron-menu-contribution.ts b/packages/core/src/electron-browser/menu/electron-menu-contribution.ts
@@ -20,10 +20,11 @@ import {
     Command, CommandContribution, CommandRegistry,
     isOSX, isWindows, MenuModelRegistry, MenuContribution, Disposable
 } from '../../common';
-import { KeybindingContribution, KeybindingRegistry } from '../../browser';
+import { KeybindingContribution, KeybindingRegistry, PreferenceScope, PreferenceService } from '../../browser';
 import { FrontendApplication, FrontendApplicationContribution, CommonMenus } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { FrontendApplicationStateService, FrontendApplicationState } from '../../browser/frontend-application-state';
+import { WindowPreferences } from '../window/window-preferences';
 
 export namespace ElectronCommands {
     export const TOGGLE_DEVELOPER_TOOLS: Command = {
@@ -65,12 +66,25 @@ export namespace ElectronMenus {
     export const FILE_CLOSE = [...CommonMenus.FILE_CLOSE, 'window-close'];
 }
 
+export namespace ZoomLevelConstraints {
+    export const MIN = -8;
+    export const MAX = 9;
+    // Amount to increment or decrement the window zoom level.
+    export const VARIATION = 0.5;
+}
+
 @injectable()
 export class ElectronMenuContribution implements FrontendApplicationContribution, CommandContribution, MenuContribution, KeybindingContribution {
 
     @inject(FrontendApplicationStateService)
     protected readonly stateService: FrontendApplicationStateService;
 
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(WindowPreferences)
+    protected readonly windowPreferences: WindowPreferences;
+
     constructor(
         @inject(ElectronMainMenuFactory) protected readonly factory: ElectronMainMenuFactory
     ) { }
@@ -152,19 +166,32 @@ export class ElectronMenuContribution implements FrontendApplicationContribution
         });
 
         registry.registerCommand(ElectronCommands.ZOOM_IN, {
-            execute: () => {
+            execute: async () => {
                 const webContents = currentWindow.webContents;
-                webContents.setZoomLevel(webContents.zoomLevel + 0.5);
+                let zoomLevel = this.roundZoomLevel(webContents.zoomLevel, ZoomLevelConstraints.VARIATION, true) + ZoomLevelConstraints.VARIATION;
+                if (zoomLevel > ZoomLevelConstraints.MAX) {
+                    zoomLevel = ZoomLevelConstraints.MAX;
+                    return;
+                };
+                this.preferenceService.set('window.zoomLevel', zoomLevel, PreferenceScope.User);
             }
         });
         registry.registerCommand(ElectronCommands.ZOOM_OUT, {
-            execute: () => {
+            execute: async () => {
                 const webContents = currentWindow.webContents;
-                webContents.setZoomLevel(webContents.zoomLevel - 0.5);
+                let zoomLevel = this.roundZoomLevel(webContents.zoomLevel, ZoomLevelConstraints.VARIATION, false) - ZoomLevelConstraints.VARIATION;
+                if (zoomLevel < ZoomLevelConstraints.MIN) {
+                    zoomLevel = ZoomLevelConstraints.MIN;
+                    return;
+                };
+                this.preferenceService.set('window.zoomLevel', zoomLevel, PreferenceScope.User);
             }
         });
         registry.registerCommand(ElectronCommands.RESET_ZOOM, {
-            execute: () => currentWindow.webContents.setZoomLevel(0)
+            execute: async () => {
+                const zoomLevel = 0;
+                this.preferenceService.set('window.zoomLevel', zoomLevel, PreferenceScope.User);
+            }
         });
     }
 
@@ -224,4 +251,15 @@ export class ElectronMenuContribution implements FrontendApplicationContribution
         });
     }
 
+    /**
+     * Returns the zoom level rounded to the nearest multiple of a specified value.
+     *
+     * @param zoomLevel the current window zoom level.
+     * @param nearestMultiple the nearest multiple to round to.
+     * @param isIncreasing true, if rounding before increasing zoom; false, if rounding before decreasing zoom.
+     */
+    private roundZoomLevel(zoomLevel: number, nearestMultiple: number, isIncreasing: boolean): number {
+        return isIncreasing ? Math.floor(zoomLevel / nearestMultiple) * nearestMultiple : Math.ceil(zoomLevel / nearestMultiple) * nearestMultiple;
+    }
+
 }
diff --git a/packages/core/src/electron-browser/window/electron-window-module.ts b/packages/core/src/electron-browser/window/electron-window-module.ts
@@ -22,11 +22,13 @@ import { ElectronClipboardService } from '../electron-clipboard-service';
 import { ClipboardService } from '../../browser/clipboard-service';
 import { ElectronMainWindowService, electronMainWindowServicePath } from '../../electron-common/electron-main-window-service';
 import { ElectronIpcConnectionProvider } from '../messaging/electron-ipc-connection-provider';
+import { bindWindowPreferences } from './window-preferences';
 
 export default new ContainerModule(bind => {
     bind(ElectronMainWindowService).toDynamicValue(context =>
         ElectronIpcConnectionProvider.createProxy(context.container, electronMainWindowServicePath)
     ).inSingletonScope();
+    bindWindowPreferences(bind);
     bind(WindowService).to(ElectronWindowService).inSingletonScope();
     bind(FrontendApplicationContribution).toService(WindowService);
     bind(ClipboardService).to(ElectronClipboardService).inSingletonScope();

diff --git a/packages/core/src/electron-browser/window/electron-window-service.ts b/packages/core/src/electron-browser/window/electron-window-service.ts
@@ -14,11 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import * as electron from 'electron';
 import { injectable, inject } from 'inversify';
 import { remote } from 'electron';
 import { NewWindowOptions } from '../../browser/window/window-service';
 import { DefaultWindowService } from '../../browser/window/default-window-service';
 import { ElectronMainWindowService } from '../../electron-common/electron-main-window-service';
+import { WindowConfiguration, WindowPreferences } from './window-preferences';
+import { PreferenceChangeEvent } from '../../browser';
 
 @injectable()
 export class ElectronWindowService extends DefaultWindowService {
@@ -33,9 +36,17 @@ export class ElectronWindowService extends DefaultWindowService {
      */
     protected closeOnUnload: boolean = false;
 
+    /**
+     * Do not update window zoom level if preference is unchanged.
+     */
+    protected prevPreferredZoomLevel: number | undefined;
+
     @inject(ElectronMainWindowService)
     protected readonly delegate: ElectronMainWindowService;
 
+    @inject(WindowPreferences)
+    protected readonly windowPreferences: WindowPreferences;
+
     openNewWindow(url: string, { external }: NewWindowOptions = {}): undefined {
         this.delegate.openNewWindow(url, { external });
         return undefined;
@@ -67,6 +78,14 @@ export class ElectronWindowService extends DefaultWindowService {
                 return this.preventUnload(event);
             }
         });
+
+        // Update changes to zoom level.
+        this.updateWindowZoomLevel();
+        this.windowPreferences.onPreferenceChanged((e: PreferenceChangeEvent<WindowConfiguration>) => {
+            if (e.preferenceName === 'window.zoomLevel') {
+                this.updateWindowZoomLevel();
+            }
+        });
     }
 
     /**
@@ -85,4 +104,19 @@ export class ElectronWindowService extends DefaultWindowService {
         });
         return response === 0; // 'Yes', close the window.
     }
+
+    /**
+     * Updates the window zoom level based on the value set in `Preferences`.
+     */
+    protected updateWindowZoomLevel(): void {
+        const preferredZoomLevel = this.windowPreferences['window.zoomLevel'];
+        if (this.prevPreferredZoomLevel === preferredZoomLevel) {
+            return;
+        }
+        this.prevPreferredZoomLevel = preferredZoomLevel;
+        const webContents = electron.remote.getCurrentWindow().webContents;
+        if (webContents.getZoomLevel() !== preferredZoomLevel) {
+            webContents.setZoomLevel(preferredZoomLevel);
+        }
+    }
 }
diff --git a/packages/core/src/electron-browser/window/window-preferences.ts b/packages/core/src/electron-browser/window/window-preferences.ts
@@ -0,0 +1,51 @@
+/********************************************************************************
+ * Copyright (C) 2021 Ericsson and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { interfaces } from 'inversify';
+import { createPreferenceProxy, PreferenceContribution, PreferenceProxy, PreferenceSchema, PreferenceService } from '../../browser/preferences';
+
+export const windowPreferencesSchema: PreferenceSchema = {
+    type: 'object',
+    scope: 'application',
+    properties: {
+        'window.zoomLevel': {
+            'type': 'number',
+            'default': 0,
+            'minimum': -8,
+            'maximum': 9,
+            'description': 'Adjust the zoom level of the window. The original size is 0. Each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller.'
+        },
+    }
+};
+
+export class WindowConfiguration {
+    'window.zoomLevel': number;
+}
+
+export const WindowPreferences = Symbol('WindowPreferences');
+export type WindowPreferences = PreferenceProxy<WindowConfiguration>;
+
+export function createWindowPreferences(preferences: PreferenceService): WindowPreferences {
+    return createPreferenceProxy(preferences, windowPreferencesSchema);
+}
+
+export function bindWindowPreferences(bind: interfaces.Bind): void {
+    bind(WindowPreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        return createWindowPreferences(preferences);
+    }).inSingletonScope();
+
+    bind(PreferenceContribution).toConstantValue({ schema: windowPreferencesSchema });
+}