Open file/folder dialog needs to know its target window (fixes microsoft#5796)

Benjamin Pasero · Benjamin Pasero · commit e0a8269fcd57 · 2016-11-25T17:33:57.000+01:00
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -75,6 +75,7 @@ interface INativeOpenDialogOptions {
 	pickFiles?: boolean;
 	path?: string;
 	forceNewWindow?: boolean;
+	window?: VSCodeWindow;
 }
 
 const ReopenFoldersSetting = {
@@ -100,8 +101,8 @@ export interface IWindowsMainService {
 	open(openConfig: IOpenConfiguration): VSCodeWindow[];
 	openPluginDevelopmentHostWindow(openConfig: IOpenConfiguration): void;
 	openFileFolderPicker(forceNewWindow?: boolean): void;
-	openFilePicker(forceNewWindow?: boolean, path?: string): void;
-	openFolderPicker(forceNewWindow?: boolean): void;
+	openFilePicker(forceNewWindow?: boolean, path?: string, window?: VSCodeWindow): void;
+	openFolderPicker(forceNewWindow?: boolean, window?: VSCodeWindow): void;
 	openAccessibilityOptions(): void;
 	focusLastActive(cli: ParsedArgs): VSCodeWindow;
 	getLastActiveWindow(): VSCodeWindow;
@@ -862,12 +863,12 @@ export class WindowsManager implements IWindowsMainService {
 		this.doPickAndOpen({ pickFolders: true, pickFiles: true, forceNewWindow });
 	}
 
-	public openFilePicker(forceNewWindow?: boolean, path?: string): void {
-		this.doPickAndOpen({ pickFiles: true, forceNewWindow, path });
+	public openFilePicker(forceNewWindow?: boolean, path?: string, window?: VSCodeWindow): void {
+		this.doPickAndOpen({ pickFiles: true, forceNewWindow, path, window });
 	}
 
-	public openFolderPicker(forceNewWindow?: boolean): void {
-		this.doPickAndOpen({ pickFolders: true, forceNewWindow });
+	public openFolderPicker(forceNewWindow?: boolean, window?: VSCodeWindow): void {
+		this.doPickAndOpen({ pickFolders: true, forceNewWindow, window });
 	}
 
 	public openAccessibilityOptions(): void {
@@ -896,7 +897,7 @@ export class WindowsManager implements IWindowsMainService {
 
 	private getFileOrFolderPaths(options: INativeOpenDialogOptions, clb: (paths: string[]) => void): void {
 		const workingDir = options.path || this.storageService.getItem<string>(WindowsManager.workingDirPickerStorageKey);
-		const focussedWindow = this.getFocusedWindow();
+		const focussedWindow = options.window || this.getFocusedWindow();
 
 		let pickerProperties: ('openFile' | 'openDirectory' | 'multiSelections' | 'createDirectory')[];
 		if (options.pickFiles && options.pickFolders) {
diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts
@@ -49,7 +49,9 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	openFolderPicker(windowId: number, forceNewWindow?: boolean): TPromise<void> {
-		this.windowsMainService.openFolderPicker(forceNewWindow);
+		const vscodeWindow = this.windowsMainService.getWindowById(windowId);
+		this.windowsMainService.openFolderPicker(forceNewWindow, vscodeWindow);
+
 		return TPromise.as(null);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ export class WindowsService implements IWindowsService, IDisposable {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`openFolderPicker(windowId: number, forceNewWindow?: boolean): TPromise<void> {`
`52`		`- this.windowsMainService.openFolderPicker(forceNewWindow);`
	`52`	`+ const vscodeWindow = this.windowsMainService.getWindowById(windowId);`
	`53`	`+ this.windowsMainService.openFolderPicker(forceNewWindow, vscodeWindow);`
	`54`	`+`
`53`	`55`	`return TPromise.as(null);`
`54`	`56`	`}`
`55`	`57`