Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-26 19:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

aux window - fix windowId issue

Browse Source
This commit is contained in:
Benjamin Pasero
2023-10-11 13:04:17 +02:00
parent c37b385e2b
commit 3e344e2cd8
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts
+8 -11
View File
@@ -25,8 +25,6 @@ export function isAuxiliaryWindow(obj: unknown): obj is AuxiliaryWindow {
export class NativeAuxiliaryWindowService extends BrowserAuxiliaryWindowService {
private readonly windowId = new DeferredPromise<number>();
constructor(
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -37,12 +35,6 @@ export class NativeAuxiliaryWindowService extends BrowserAuxiliaryWindowService
protected override create(auxiliaryWindow: AuxiliaryWindow, disposables: DisposableStore) {
// Obtain window identifier
(async () => {
const windowId = await getGlobals(auxiliaryWindow)?.ipcRenderer.invoke('vscode:getWindowId');
this.windowId.complete(windowId);
})();
// Zoom level
const windowConfig = this.configurationService.getValue<IWindowsConfiguration>();
const windowZoomLevel = typeof windowConfig.window?.zoomLevel === 'number' ? windowConfig.window.zoomLevel : 0;
@@ -54,21 +46,26 @@ export class NativeAuxiliaryWindowService extends BrowserAuxiliaryWindowService
protected override patchMethods(auxiliaryWindow: AuxiliaryWindow): void {
super.patchMethods(auxiliaryWindow);
const that = this;
// Obtain window identifier
const windowId = new DeferredPromise<number>();
(async () => {
windowId.complete(await getGlobals(auxiliaryWindow)?.ipcRenderer.invoke('vscode:getWindowId'));
})();
// Enable `window.focus()` to work in Electron by
// asking the main process to focus the window.
const that = this;
const originalWindowFocus = auxiliaryWindow.focus.bind(auxiliaryWindow);
auxiliaryWindow.focus = async function () {
originalWindowFocus();
await that.nativeHostService.focusWindow({ targetWindowId: await that.windowId.p });
await that.nativeHostService.focusWindow({ targetWindowId: await windowId.p });
};
// Add a method to move window to the top
Object.defineProperty(auxiliaryWindow, 'moveTop', {
value: async () => {
await that.nativeHostService.moveWindowTop({ targetWindowId: await that.windowId.p });
await that.nativeHostService.moveWindowTop({ targetWindowId: await windowId.p });
},
writable: false,
enumerable: false,