Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-14 12:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

aux window - use active window bounds as location for new windows and offset as necessary (#199542)

Browse Source
This commit is contained in:
Benjamin Pasero
2023-11-29 14:59:03 +01:00
committed by GitHub
parent 856b69c616
commit 42e35009a0
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
+27 -11
View File
@@ -207,18 +207,34 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
private async openWindow(options?: IAuxiliaryWindowOpenOptions): Promise<Window | undefined> {
const activeWindow = getActiveWindow();
const width = options?.bounds?.width ?? BrowserAuxiliaryWindowService.DEFAULT_SIZE.width;
const height = options?.bounds?.height ?? BrowserAuxiliaryWindowService.DEFAULT_SIZE.height;
const bounds: IRectangle = {
x: options?.bounds?.x ?? (activeWindow.screen.availWidth / 2 - width / 2),
y: options?.bounds?.y ?? (activeWindow.screen.availHeight / 2 - height / 2),
width: Math.max(width, WindowMinimumSize.WIDTH),
height: Math.max(height, WindowMinimumSize.HEIGHT)
const activeWindowBounds = {
x: activeWindow.screenX,
y: activeWindow.screenY,
width: activeWindow.outerWidth,
height: activeWindow.outerHeight
};
const auxiliaryWindow = mainWindow.open('about:blank', undefined, `popup=yes,left=${bounds.x},top=${bounds.y},width=${bounds.width},height=${bounds.height}`);
const width = Math.max(options?.bounds?.width ?? BrowserAuxiliaryWindowService.DEFAULT_SIZE.width, WindowMinimumSize.WIDTH);
const height = Math.max(options?.bounds?.height ?? BrowserAuxiliaryWindowService.DEFAULT_SIZE.height, WindowMinimumSize.HEIGHT);
let newWindowBounds: IRectangle = {
x: options?.bounds?.x ?? (activeWindowBounds.x + activeWindowBounds.width / 2 - width / 2),
y: options?.bounds?.y ?? (activeWindowBounds.y + activeWindowBounds.height / 2 - height / 2),
width,
height
};
if (newWindowBounds.x === activeWindowBounds.x && newWindowBounds.y === activeWindowBounds.y) {
// Offset the new window a bit so that it does not overlap
// with the active window
newWindowBounds = {
...newWindowBounds,
x: newWindowBounds.x + 30,
y: newWindowBounds.y + 30
};
}
const auxiliaryWindow = mainWindow.open('about:blank', undefined, `popup=yes,left=${newWindowBounds.x},top=${newWindowBounds.y},width=${newWindowBounds.width},height=${newWindowBounds.height}`);
if (!auxiliaryWindow && isWeb) {
return (await this.dialogService.prompt({
type: Severity.Warning,
@@ -227,7 +243,7 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
buttons: [
{
label: localize({ key: 'retry', comment: ['&& denotes a mnemonic'] }, "&&Retry"),
run: () => this.openWindow({ bounds })
run: () => this.openWindow(options)
}
],
cancelButton: true