diff --git a/src/vs/base/electron-sandbox/globals.ts b/src/vs/base/electron-sandbox/globals.ts index 504c5b018ab..b9fee9289f1 100644 --- a/src/vs/base/electron-sandbox/globals.ts +++ b/src/vs/base/electron-sandbox/globals.ts @@ -45,4 +45,16 @@ export const webFrame = (window as any).vscode.webFrame as { * The current zoom factor. */ getZoomFactor(): number; + + /** + * The current zoom level. + */ + getZoomLevel(): number; + + /** + * Changes the zoom level to the specified level. The original size is 0 and each + * increment above or below represents zooming 20% larger or smaller to default + * limits of 300% and 50% of original size, respectively. + */ + setZoomLevel(level: number): void; }; diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index ffa8d678d88..873f36802e1 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/issueReporter'; -import { clipboard, shell, webFrame } from 'electron'; -import { ipcRenderer } from 'vs/base/electron-sandbox/globals'; +import { clipboard, shell } from 'electron'; +import { ipcRenderer, webFrame } from 'vs/base/electron-sandbox/globals'; import * as os from 'os'; import * as browser from 'vs/base/browser/browser'; import { $ } from 'vs/base/browser/dom'; diff --git a/src/vs/code/electron-browser/preload.js b/src/vs/code/electron-browser/preload.js index 20012388f48..14afb13f922 100644 --- a/src/vs/code/electron-browser/preload.js +++ b/src/vs/code/electron-browser/preload.js @@ -70,6 +70,17 @@ getZoomFactor() { return webFrame.getZoomFactor(); + }, + + getZoomLevel() { + return webFrame.getZoomLevel(); + }, + + /** + * @param {number} level + */ + setZoomLevel(level) { + webFrame.setZoomLevel(level); } } }; diff --git a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts index 7f7a7859381..47e56f51023 100644 --- a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts +++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/processExplorer'; -import { webFrame, clipboard } from 'electron'; -import { ipcRenderer } from 'vs/base/electron-sandbox/globals'; +import { clipboard } from 'electron'; +import { webFrame, ipcRenderer } from 'vs/base/electron-sandbox/globals'; import { repeat } from 'vs/base/common/strings'; import { totalmem } from 'os'; import product from 'vs/platform/product/common/product'; diff --git a/src/vs/workbench/contrib/issue/electron-browser/issueService.ts b/src/vs/workbench/contrib/issue/electron-browser/issueService.ts index 0f18222f7ff..d576577f0ac 100644 --- a/src/vs/workbench/contrib/issue/electron-browser/issueService.ts +++ b/src/vs/workbench/contrib/issue/electron-browser/issueService.ts @@ -9,7 +9,7 @@ import { textLinkForeground, inputBackground, inputBorder, inputForeground, butt import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -import { webFrame } from 'electron'; +import { webFrame } from 'vs/base/electron-sandbox/globals'; import { assign } from 'vs/base/common/objects'; import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issue'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; diff --git a/src/vs/workbench/electron-browser/actions/windowActions.ts b/src/vs/workbench/electron-browser/actions/windowActions.ts index 255a094fa06..4e9ebf5bad2 100644 --- a/src/vs/workbench/electron-browser/actions/windowActions.ts +++ b/src/vs/workbench/electron-browser/actions/windowActions.ts @@ -10,7 +10,7 @@ import { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; import * as browser from 'vs/base/browser/browser'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { webFrame } from 'electron'; +import { webFrame } from 'vs/base/electron-sandbox/globals'; import { FileKind } from 'vs/platform/files/common/files'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IModeService } from 'vs/editor/common/services/modeService'; diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts index bfc2ec1c9e2..18eeb4df089 100644 --- a/src/vs/workbench/electron-browser/desktop.main.ts +++ b/src/vs/workbench/electron-browser/desktop.main.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as gracefulFs from 'graceful-fs'; -import { webFrame } from 'electron'; +import { webFrame } from 'vs/base/electron-sandbox/globals'; import { importEntries, mark } from 'vs/base/common/performance'; import { Workbench } from 'vs/workbench/browser/workbench'; import { NativeWindow } from 'vs/workbench/electron-browser/window'; diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index f95e03e84d0..614f80144c7 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -22,8 +22,8 @@ import * as browser from 'vs/base/browser/browser'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IResourceEditorInput } from 'vs/platform/editor/common/editor'; import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/nativeKeymapService'; -import { webFrame, crashReporter, CrashReporterStartOptions } from 'electron'; -import { ipcRenderer } from 'vs/base/electron-sandbox/globals'; +import { crashReporter, CrashReporterStartOptions } from 'electron'; +import { ipcRenderer, webFrame } from 'vs/base/electron-sandbox/globals'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing'; import { IMenuService, MenuId, IMenu, MenuItemAction, ICommandAction, SubmenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';