@theia/core 1.70.0-next.7 → 1.70.0-next.71

package/src/electron-browser/window/window-zoom-action-bar.tsx

@@ -0,0 +1,115 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+import { createRoot } from 'react-dom/client';
+import * as React from '../../../shared/react';
+import { ACTION_ITEM, codicon, CommonCommands, KeybindingRegistry } from '../../browser';
+import { Command, CommandRegistry, nls } from '../../common';
+import { PREF_WINDOW_ZOOM_LEVEL, ZoomLevel } from '../../electron-common/electron-window-preferences';
+import { ElectronCommands } from '../menu/electron-menu-contribution';
+
+export interface WindowZoomActionBarProps {
+    container: HTMLElement
+    zoomLevel: number;
+    commandRegistry: CommandRegistry;
+    keybindingRegistry: KeybindingRegistry;
+}
+
+export class WindowZoomActionBar extends React.Component<WindowZoomActionBarProps> {
+
+    protected getTitleWithKeybinding(command: Command): string {
+        const bindings = this.props.keybindingRegistry.getKeybindingsForCommand(command.id);
+        // Only consider the first active keybinding.
+        if (bindings.length) {
+            const binding = bindings.find(b => this.props.keybindingRegistry.isEnabledInScope(b, this.props.container));
+            if (binding) {
+                const accelerator = this.props.keybindingRegistry.acceleratorFor(binding, '+', true);
+                return `${command.label} (${accelerator})`;
+            }
+        }
+        return command.label!;
+    }
+
+    protected renderActionButton(command: Command, iconName?: string, commandArgs: unknown[] = []): React.ReactNode {
+        return (
+            <div
+                className={`${ACTION_ITEM} window-zoom-button`}
+                role='button'
+                tabIndex={0}
+                aria-label={command.label}
+                title={this.getTitleWithKeybinding(command)}
+                onClick={() => this.props.commandRegistry.executeCommand(command.id, ...commandArgs)}
+                onKeyDown={e => {
+                    if (e.key === 'Enter' || e.key === ' ') {
+                        e.preventDefault();
+                        this.props.commandRegistry.executeCommand(command.id, ...commandArgs);
+                    }
+                }}
+            >
+                {iconName ? <div className={codicon(iconName)}></div> : <div>{command.label}</div>}
+            </div>
+        );
+    }
+
+    protected renderZoomDisplay(): React.ReactNode {
+        const percentage = Math.round(100 * Math.pow(ZoomLevel.ZOOM_BASE, this.props.zoomLevel));
+        const zoomLevelText = nls.localizeByDefault('Zoom Level: {0} ({1}%)', this.props.zoomLevel.toString(), percentage.toString());
+        return (
+            <div
+                className='window-zoom-display'
+                role='status'
+                aria-live='polite'
+                aria-atomic='true'
+                aria-label={zoomLevelText}
+                title={zoomLevelText}
+            >
+                <div>{this.props.zoomLevel}</div>
+            </div>
+        );
+    }
+
+    override render(): React.ReactNode {
+        return (
+            <>
+                {this.renderActionButton(ElectronCommands.ZOOM_OUT, 'remove')}
+                {this.renderZoomDisplay()}
+                {this.renderActionButton(ElectronCommands.ZOOM_IN, 'plus')}
+                {this.renderActionButton(ElectronCommands.RESET_ZOOM)}
+                {this.renderActionButton(CommonCommands.OPEN_PREFERENCES, 'settings-gear', [PREF_WINDOW_ZOOM_LEVEL])}
+            </>
+        );
+    }
+}
+
+/**
+ * Helper function to render the WindowZoomActionBar React component into a DOM container element.
+ * This function can be called from a TypeScript file without JSX.
+ */
+export function renderWindowZoomActionBar(
+    container: HTMLElement,
+    zoomLevel: number,
+    commandRegistry: CommandRegistry,
+    keybindingRegistry: KeybindingRegistry,
+): void {
+    const root = createRoot(container);
+    root.render(
+        <WindowZoomActionBar
+            container={container}
+            zoomLevel={zoomLevel}
+            commandRegistry={commandRegistry}
+            keybindingRegistry={keybindingRegistry}
+        />
+    );
+}

package/src/electron-browser/window/window-zoom-status-bar-item.ts

@@ -0,0 +1,81 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from 'inversify';
+import { FrontendApplicationContribution, KeybindingRegistry, StatusBar, StatusBarAlignment } from '../../browser';
+import { CommandRegistry, nls, PreferenceService } from '../../common';
+import { PREF_WINDOW_ZOOM_LEVEL } from '../../electron-common/electron-window-preferences';
+import { renderWindowZoomActionBar } from './window-zoom-action-bar';
+
+@injectable()
+export class WindowZoomStatusBarItem implements FrontendApplicationContribution {
+
+    static readonly ID = 'window-zoom-status';
+
+    @inject(StatusBar)
+    protected readonly statusBar: StatusBar;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(KeybindingRegistry)
+    protected readonly keybindingRegistry: KeybindingRegistry;
+
+    onStart(): void {
+        this.preferenceService.ready.then(() => {
+            this.updateZoomStatusBarItem();
+
+            this.preferenceService.onPreferenceChanged(e => {
+                if (e.preferenceName === PREF_WINDOW_ZOOM_LEVEL) {
+                    this.updateZoomStatusBarItem();
+                }
+            });
+        });
+    }
+
+    protected updateZoomStatusBarItem(): void {
+        const zoomLevel = this.getZoomLevel();
+
+        if (zoomLevel === 0) {
+            // Hide the status bar item when zoom is at default level
+            this.statusBar.removeElement(WindowZoomStatusBarItem.ID);
+        } else {
+            this.statusBar.setElement(WindowZoomStatusBarItem.ID, {
+                name: nls.localizeByDefault('Window Zoom'),
+                text: zoomLevel > 0 ? '$(codicon-zoom-in)' : '$(codicon-zoom-out)',
+                alignment: StatusBarAlignment.RIGHT,
+                priority: 110,
+                tooltip: () => this.createTooltip(zoomLevel),
+                backgroundColor: 'var(--theia-statusBarItem-prominentBackground)',
+                color: 'var(--theia-statusBarItem-prominentForeground)'
+            });
+        }
+    }
+
+    protected getZoomLevel(): number {
+        return this.preferenceService.get(PREF_WINDOW_ZOOM_LEVEL, 0);
+    }
+
+    protected createTooltip(zoomLevel: number): HTMLElement {
+        const container = document.createElement('div');
+        container.className = 'window-zoom-action-bar';
+        renderWindowZoomActionBar(container, zoomLevel, this.commandRegistry, this.keybindingRegistry);
+        return container;
+    }
+}

package/src/electron-common/electron-api.ts

@@ -85,7 +85,7 @@ export interface TheiaCoreAPI {
     toggleDevTools(): void;
     openDevToolsForWindow(windowName: string): void;
     getZoomLevel(): Promise<number>;
-    setZoomLevel(desired: number): void;
+    setZoomLevel(desired: number, windowName?: string): void;
 
     isFullScreenable(): boolean; // TODO: this should really be async, since it blocks the renderer process
     isFullScreen(): boolean; // TODO: this should really be async, since it blocks the renderer process

package/src/electron-common/electron-main-window-service.ts

@@ -20,5 +20,6 @@ export const electronMainWindowServicePath = '/services/electron-window';
 export const ElectronMainWindowService = Symbol('ElectronMainWindowService');
 export interface ElectronMainWindowService {
     openNewWindow(url: string, options?: NewWindowOptions): undefined;
-    openNewDefaultWindow(params?: WindowSearchParams): void;
+    openNewDefaultWindow(params?: WindowSearchParams): Promise<number>;
+    closeWindow(windowId: number): void;
 }

package/src/electron-common/electron-window-preferences.ts

@@ -27,20 +27,28 @@ export namespace ZoomLevel {
     export const MAX = 9;
     // amount to increment or decrement the window zoom level.
     export const VARIATION = 0.5;
+    // Chromium's base for zoom factor calculation: zoomFactor = pow(ZOOM_BASE, zoomLevel)
+    // See https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/common/page/page_zoom.cc
+    export const ZOOM_BASE = 1.2;
 }
 
+export const PREF_WINDOW_ZOOM_LEVEL = 'window.zoomLevel';
+export const PREF_WINDOW_TITLE_BAR_STYLE = 'window.titleBarStyle';
+
 export const electronWindowPreferencesSchema: PreferenceSchema = {
     properties: {
-        'window.zoomLevel': {
-            'type': 'number',
-            'default': ZoomLevel.DEFAULT,
-            'minimum': ZoomLevel.MIN,
-            'maximum': ZoomLevel.MAX,
-            'scope': PreferenceScope.User,
-            // eslint-disable-next-line max-len
-            'description': nls.localizeByDefault("Adjust the default zoom level for all windows. Each increment above `0` (e.g. `1`) or below (e.g. `-1`) represents zooming `20%` larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity. See {0} for configuring if the 'Zoom In' and 'Zoom Out' commands apply the zoom level to all windows or only the active window.")
+        [PREF_WINDOW_ZOOM_LEVEL]: {
+            type: 'number',
+            default: ZoomLevel.DEFAULT,
+            minimum: ZoomLevel.MIN,
+            maximum: ZoomLevel.MAX,
+            scope: PreferenceScope.User,
+            markdownDescription: nls.localize('theia/core/window/zoomLevelPref',
+                'Adjust the default zoom level for all windows.\
+                Each increment of `0.5` above `0` (e.g. `0.5`) or below (e.g. `-0.5`) represents zooming approximately `10%` larger or smaller.\
+                You can also enter other decimal values to adjust the zoom level with a finer granularity.')
         },
-        'window.titleBarStyle': {
+        [PREF_WINDOW_TITLE_BAR_STYLE]: {
             type: 'string',
             enum: ['native', 'custom'],
             default: isWindows ? 'custom' : 'native',
@@ -52,8 +60,8 @@ export const electronWindowPreferencesSchema: PreferenceSchema = {
 };
 
 export class ElectronWindowConfiguration {
-    'window.zoomLevel': number;
-    'window.titleBarStyle': 'native' | 'custom';
+    [PREF_WINDOW_ZOOM_LEVEL]: number;
+    [PREF_WINDOW_TITLE_BAR_STYLE]: 'native' | 'custom';
 }
 
 export const ElectronWindowPreferenceContribution = Symbol('ElectronWindowPreferenceContribution');

package/src/electron-main/electron-api-main.ts

@@ -217,8 +217,18 @@ export class TheiaMainApi implements ElectronMainApplicationContribution {
             }
         });
 
-        ipcMain.on(CHANNEL_SET_ZOOM_LEVEL, (event, zoomLevel: number) => {
-            event.sender.setZoomLevel(zoomLevel);
+        ipcMain.on(CHANNEL_SET_ZOOM_LEVEL, (event, zoomLevel: number, windowName: string | undefined) => {
+            let electronWindow;
+            if (windowName) {
+                electronWindow = BrowserWindow.getAllWindows().find(win => win.webContents.mainFrame.name === windowName);
+            } else {
+                electronWindow = BrowserWindow.fromWebContents(event.sender);
+            }
+            if (electronWindow) {
+                electronWindow.webContents.setZoomLevel(zoomLevel);
+            } else {
+                console.warn(`There is no known window '${windowName}'. Thus, the zoom level could not be set.`);
+            }
         });
 
         ipcMain.handle(CHANNEL_GET_ZOOM_LEVEL, event => event.sender.getZoomLevel());

package/src/electron-main/electron-main-application.ts

@@ -502,6 +502,13 @@ export class ElectronMainApplication {
         };
     }
 
+    closeWindowById(webContentsId: number): void {
+        const window = this.windows.get(webContentsId);
+        if (window) {
+            window.close(StopReason.Close);
+        }
+    }
+
     async openDefaultWindow(params?: WindowSearchParams): Promise<BrowserWindow> {
         const options = this.getDefaultTheiaWindowOptions();
         const [uri, electronWindow] = await Promise.all([this.createWindowUri(params), this.reuseOrCreateWindow(options)]);

package/src/electron-main/electron-main-window-service-impl.ts

@@ -37,8 +37,13 @@ export class ElectronMainWindowServiceImpl implements ElectronMainWindowService
         return undefined;
     }
 
-    openNewDefaultWindow(params?: WindowSearchParams): void {
-        this.app.openDefaultWindow(params);
+    async openNewDefaultWindow(params?: WindowSearchParams): Promise<number> {
+        const electronWindow = await this.app.openDefaultWindow(params);
+        return electronWindow.webContents.id;
+    }
+
+    closeWindow(windowId: number): void {
+        this.app.closeWindowById(windowId);
     }
 
 }

package/lib/browser/tree/fuzzy-search.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fuzzy-search.spec.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.spec.ts"],"names":[],"mappings":""}

package/lib/browser/tree/fuzzy-search.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fuzzy-search.spec.js","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.spec.ts"],"names":[],"mappings":"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"}