Use the async version of Electron's dialog API (#40211)

* dialogs - move dialog handling to main side * dialogs - adopt windows dialogs methods in main * dialogs - use async dialog API and queue up dialogs on the main side
microsoft · Dec 14, 2017 · 78cc1e9 · 78cc1e9
1 parent a0ac2af
commit 78cc1e9
Show file tree

Hide file tree

Showing 12 changed files with 254 additions and 197 deletions.
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { app, ipcMain as ipc, BrowserWindow, dialog } from 'electron';
+import { app, ipcMain as ipc, BrowserWindow } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext } from 'vs/platform/windows/common/windows';
@@ -376,6 +376,7 @@ export class CodeApplication {
 
 	private afterWindowOpen(accessor: ServicesAccessor): void {
 		const appInstantiationService = accessor.get(IInstantiationService);
+		const windowsMainService = accessor.get(IWindowsMainService);
 
 		let windowsMutex: Mutex = null;
 		if (platform.isWindows) {
@@ -387,7 +388,7 @@ export class CodeApplication {
 				this.toDispose.push({ dispose: () => windowsMutex.release() });
 			} catch (e) {
 				if (!this.environmentService.isBuilt) {
-					dialog.showMessageBox({
+					windowsMainService.showMessageBox({
 						title: product.nameLong,
 						type: 'warning',
 						message: 'Failed to load windows-mutex!',
@@ -403,7 +404,7 @@ export class CodeApplication {
 				<any>require.__$__nodeRequire('windows-foreground-love');
 			} catch (e) {
 				if (!this.environmentService.isBuilt) {
-					dialog.showMessageBox({
+					windowsMainService.showMessageBox({
 						title: product.nameLong,
 						type: 'warning',
 						message: 'Failed to load windows-foreground-love!',

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import { isMacintosh, isLinux, isWindows, language } from 'vs/base/common/platform';
 import * as arrays from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ipcMain as ipc, app, shell, dialog, Menu, MenuItem, BrowserWindow, clipboard } from 'electron';
+import { ipcMain as ipc, app, shell, Menu, MenuItem, BrowserWindow, clipboard } from 'electron';
 import { OpenContext, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { AutoSaveConfiguration } from 'vs/platform/files/common/files';
@@ -1217,20 +1217,18 @@ export class CodeMenu {
 			buttons.push(mnemonicButtonLabel(nls.localize({ key: 'copy', comment: ['&& denotes a mnemonic'] }, "&&Copy"))); // https://github.com/Microsoft/vscode/issues/37608
 		}
 
-		const result = dialog.showMessageBox(lastActiveWindow && lastActiveWindow.win, {
+		this.windowsMainService.showMessageBox({
 			title: product.nameLong,
 			type: 'info',
 			message: product.nameLong,
 			detail: `\n${detail}`,
 			buttons,
 			noLink: true
+		}, lastActiveWindow).then(result => {
+			if (isWindows && result.button === 1) {
+				clipboard.writeText(detail);
+			}
 		});
-
-		if (isWindows && result === 1) {
-			clipboard.writeText(detail);
-		}
-
-		this.reportMenuActionTelemetry('showAboutDialog');
 	}
 
 	private openUrl(url: string, id: string): void {