提交 d0d8929d 编写于 作者: B Benjamin Pasero

fix #46818

上级 4132c13a
......@@ -56,7 +56,10 @@ export class ProxyAuthHandler {
width: 450,
height: 220,
show: true,
title: 'VS Code'
title: 'VS Code',
webPreferences: {
disableBlinkFeatures: 'Auxclick'
}
};
const focusedWindow = this.windowsMainService.getFocusedWindow();
......
......@@ -19,6 +19,7 @@ import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces
import { Schemas } from 'vs/base/common/network';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import URI from 'vs/base/common/uri';
import { BrowserWindow } from 'electron';
export const ID = 'launchService';
export const ILaunchService = createDecorator<ILaunchService>(ID);
......@@ -245,12 +246,20 @@ export class LaunchService implements ILaunchService {
public getMainProcessInfo(): TPromise<IMainProcessInfo> {
this.logService.trace('Received request for main process info from other instance.');
const windows: IWindowInfo[] = [];
BrowserWindow.getAllWindows().forEach(window => {
const codeWindow = this.windowsMainService.getWindowById(window.id);
if (codeWindow) {
windows.push(this.codeWindowToInfo(codeWindow));
} else {
windows.push(this.browserWindowToInfo(window));
}
});
return TPromise.wrap({
mainPID: process.pid,
mainArguments: process.argv,
windows: this.windowsMainService.getWindows().map(window => {
return this.getWindowInfo(window);
})
windows
} as IMainProcessInfo);
}
......@@ -260,7 +269,7 @@ export class LaunchService implements ILaunchService {
return TPromise.as(this.environmentService.logsPath);
}
private getWindowInfo(window: ICodeWindow): IWindowInfo {
private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
const folders: string[] = [];
if (window.openedFolderPath) {
......@@ -274,9 +283,13 @@ export class LaunchService implements ILaunchService {
});
}
return this.browserWindowToInfo(window.win, folders);
}
private browserWindowToInfo(win: BrowserWindow, folders: string[] = []): IWindowInfo {
return {
pid: window.win.webContents.getOSProcessId(),
title: window.win.getTitle(),
pid: win.webContents.getOSProcessId(),
title: win.getTitle(),
folders
} as IWindowInfo;
}
......
......@@ -1137,7 +1137,10 @@ export class CodeMenu {
width: 450,
height: 300,
show: true,
title: nls.localize('accessibilityOptionsWindowTitle', "Accessibility Options")
title: nls.localize('accessibilityOptionsWindowTitle', "Accessibility Options"),
webPreferences: {
disableBlinkFeatures: 'Auxclick'
}
});
win.setMenuBarVisibility(false);
......
......@@ -61,7 +61,10 @@ export class IssueService implements IIssueService {
x: position.x,
y: position.y,
title: localize('issueReporter', "Issue Reporter"),
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
webPreferences: {
disableBlinkFeatures: 'Auxclick'
}
});
this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
......@@ -106,7 +109,10 @@ export class IssueService implements IIssueService {
x: position.x,
y: position.y,
backgroundColor: data.styles.backgroundColor,
title: localize('processExplorer', "Process Explorer")
title: localize('processExplorer', "Process Explorer"),
webPreferences: {
disableBlinkFeatures: 'Auxclick'
}
});
this._processExplorerWindow.setMenuBarVisibility(false);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册