Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-29 00:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benjamin Pasero
2016-11-25 17:33:57 +01:00
parent dcbfc1a9b7
commit e0a8269fcd
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/electron-main/windows.ts
+8 -7
View File
@@ -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) {
src/vs/platform/windows/electron-main/windowsService.ts
+3 -1
View File
@@ -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);
}