Skip to content

Commit 246d259

Browse files
author
Benjamin Pasero
committed
sandbox - add webFrame APIs
1 parent 062d939 commit 246d259

8 files changed

Lines changed: 32 additions & 9 deletions

File tree

src/vs/base/electron-sandbox/globals.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,16 @@ export const webFrame = (window as any).vscode.webFrame as {
4545
* The current zoom factor.
4646
*/
4747
getZoomFactor(): number;
48+
49+
/**
50+
* The current zoom level.
51+
*/
52+
getZoomLevel(): number;
53+
54+
/**
55+
* Changes the zoom level to the specified level. The original size is 0 and each
56+
* increment above or below represents zooming 20% larger or smaller to default
57+
* limits of 300% and 50% of original size, respectively.
58+
*/
59+
setZoomLevel(level: number): void;
4860
};

src/vs/code/electron-browser/issue/issueReporterMain.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./media/issueReporter';
7-
import { clipboard, shell, webFrame } from 'electron';
8-
import { ipcRenderer } from 'vs/base/electron-sandbox/globals';
7+
import { clipboard, shell } from 'electron';
8+
import { ipcRenderer, webFrame } from 'vs/base/electron-sandbox/globals';
99
import * as os from 'os';
1010
import * as browser from 'vs/base/browser/browser';
1111
import { $ } from 'vs/base/browser/dom';

src/vs/code/electron-browser/preload.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@
7070

7171
getZoomFactor() {
7272
return webFrame.getZoomFactor();
73+
},
74+
75+
getZoomLevel() {
76+
return webFrame.getZoomLevel();
77+
},
78+
79+
/**
80+
* @param {number} level
81+
*/
82+
setZoomLevel(level) {
83+
webFrame.setZoomLevel(level);
7384
}
7485
}
7586
};

src/vs/code/electron-browser/processExplorer/processExplorerMain.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./media/processExplorer';
7-
import { webFrame, clipboard } from 'electron';
8-
import { ipcRenderer } from 'vs/base/electron-sandbox/globals';
7+
import { clipboard } from 'electron';
8+
import { webFrame, ipcRenderer } from 'vs/base/electron-sandbox/globals';
99
import { repeat } from 'vs/base/common/strings';
1010
import { totalmem } from 'os';
1111
import product from 'vs/platform/product/common/product';

src/vs/workbench/contrib/issue/electron-browser/issueService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { textLinkForeground, inputBackground, inputBorder, inputForeground, butt
99
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
1010
import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
1111
import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
12-
import { webFrame } from 'electron';
12+
import { webFrame } from 'vs/base/electron-sandbox/globals';
1313
import { assign } from 'vs/base/common/objects';
1414
import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issue';
1515
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';

src/vs/workbench/electron-browser/actions/windowActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Action } from 'vs/base/common/actions';
1010
import * as nls from 'vs/nls';
1111
import * as browser from 'vs/base/browser/browser';
1212
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
13-
import { webFrame } from 'electron';
13+
import { webFrame } from 'vs/base/electron-sandbox/globals';
1414
import { FileKind } from 'vs/platform/files/common/files';
1515
import { IModelService } from 'vs/editor/common/services/modelService';
1616
import { IModeService } from 'vs/editor/common/services/modeService';

src/vs/workbench/electron-browser/desktop.main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as fs from 'fs';
77
import * as gracefulFs from 'graceful-fs';
8-
import { webFrame } from 'electron';
8+
import { webFrame } from 'vs/base/electron-sandbox/globals';
99
import { importEntries, mark } from 'vs/base/common/performance';
1010
import { Workbench } from 'vs/workbench/browser/workbench';
1111
import { NativeWindow } from 'vs/workbench/electron-browser/window';

src/vs/workbench/electron-browser/window.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import * as browser from 'vs/base/browser/browser';
2222
import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
2323
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
2424
import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/nativeKeymapService';
25-
import { webFrame, crashReporter, CrashReporterStartOptions } from 'electron';
26-
import { ipcRenderer } from 'vs/base/electron-sandbox/globals';
25+
import { crashReporter, CrashReporterStartOptions } from 'electron';
26+
import { ipcRenderer, webFrame } from 'vs/base/electron-sandbox/globals';
2727
import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
2828
import { IMenuService, MenuId, IMenu, MenuItemAction, ICommandAction, SubmenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
2929
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

0 commit comments

Comments
 (0)