development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make dealing with window state more safe

Browse source
This commit is contained in:
Daniel Imms 2022-12-15 11:37:00 -08:00
parent 6ec7f2675e
commit af15273582
No known key found for this signature in database
GPG key ID: E5CF412B63651C69
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/vs/platform/issue/electron-main/issueMainService.ts
View file

@ -41,6 +41,8 @@ interface IBrowserWindowOptions {
alwaysOnTop: boolean;
}
type IStrictWindowState = Required<Pick<IWindowState, 'x' | 'y' | 'width' | 'height'>>;
export interface IIssueMainService extends ICommonIssueService {
stopTracing(): Promise<void>;
}
@ -274,15 +276,13 @@ export class IssueMainService implements IIssueMainService {
const processExplorerWindowConfigUrl = processExplorerDisposables.add(this.protocolMainService.createIPCObjectUrl<ProcessExplorerWindowConfiguration>());
let position: IWindowState = this.safeParseJson(this.applicationStorageMainService.get(processExplorerWindowState, StorageScope.APPLICATION), undefined);
if (!position) {
position = this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
}
const savedPosition = this.safeParseJson(this.applicationStorageMainService.get(processExplorerWindowState, StorageScope.APPLICATION), undefined);
const position = isStrictWindowState(savedPosition) ? savedPosition : this.getWindowPosition(this.processExplorerParentWindow, 800, 500);
// Correct dimensions to take scale/dpr into account
const displayToUse = screen.getDisplayNearestPoint({ x: position.x!, y: position.y! });
position.width! /= displayToUse.scaleFactor;
position.height! /= displayToUse.scaleFactor;
position.width /= displayToUse.scaleFactor;
position.height /= displayToUse.scaleFactor;
this.processExplorerWindow = this.createBrowserWindow(position, processExplorerWindowConfigUrl, {
backgroundColor: data.styles.backgroundColor,
@ -392,7 +392,7 @@ export class IssueMainService implements IIssueMainService {
return this.diagnosticsService.getDiagnostics(info, remoteData);
}
private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IWindowState {
private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number): IStrictWindowState {
// We want the new window to open on the same display that the parent is in
let displayToUse: Display | undefined;
@ -423,14 +423,14 @@ export class IssueMainService implements IIssueMainService {
}
}
const state: IWindowState = {
width: defaultWidth,
height: defaultHeight
};
const displayBounds = displayToUse.bounds;
state.x = displayBounds.x + (displayBounds.width / 2) - (state.width! / 2);
state.y = displayBounds.y + (displayBounds.height / 2) - (state.height! / 2);
const state: IStrictWindowState = {
width: defaultWidth,
height: defaultHeight,
x: displayBounds.x + (displayBounds.width / 2) - (defaultWidth / 2),
y: displayBounds.y + (displayBounds.height / 2) - (defaultHeight / 2)
};
if (displayBounds.width > 0 && displayBounds.height > 0 /* Linux X11 sessions sometimes report wrong display bounds */) {
if (state.x < displayBounds.x) {
@ -494,3 +494,15 @@ export class IssueMainService implements IIssueMainService {
this.nativeHostMainService.showItemInFolder(undefined, path);
}
}
function isStrictWindowState(obj: unknown): obj is IStrictWindowState {
if (typeof obj !== 'object' || obj === null) {
return false;
}
return (
'x' in obj &&
'y' in obj &&
'width' in obj &&
'height' in obj
);
}