bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-06 00:03:29 +00:00
Code Issues Releases Wiki Activity

[bug] Properly define stored window state (#638)

Browse Source
This commit is contained in:
Addison Beck
2022-01-27 10:44:09 -05:00
committed by GitHub
parent 0186610ca4
commit 83305313f9
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
electron/src/window.main.ts
View File

@@ -99,7 +99,6 @@ export class WindowMain {
async createWindow(): Promise<void> {
this.windowStates[mainWindowSizeKey] = await this.getWindowState(
mainWindowSizeKey,
this.defaultWidth,
this.defaultHeight
);
@@ -214,7 +213,7 @@ export class WindowMain {
const bounds = win.getBounds();
if (this.windowStates[configKey] == null) {
this.windowStates[configKey] = (await this.stateService.getWindow()).get(configKey);
this.windowStates[configKey] = await this.stateService.getWindow();
if (this.windowStates[configKey] == null) {
this.windowStates[configKey] = {};
}
@@ -230,25 +229,20 @@ export class WindowMain {
this.windowStates[configKey].height = bounds.height;
}
const cachedWindow = (await this.stateService.getWindow()) ?? new Map<string, any>();
cachedWindow.set(configKey, this.windowStates[configKey]);
await this.stateService.setWindow(cachedWindow);
await this.stateService.setWindow(this.windowStates[configKey]);
} catch (e) {
this.logService.error(e);
}
}
private async getWindowState(configKey: string, defaultWidth: number, defaultHeight: number) {
const windowState = (await this.stateService.getWindow()) ?? new Map<string, any>();
let state = windowState.has(configKey) ? windowState.get(configKey) : null;
private async getWindowState(defaultWidth: number, defaultHeight: number) {
const state = await this.stateService.getWindow();
const isValid = state != null && (this.stateHasBounds(state) || state.isMaximized);
let displayBounds: Electron.Rectangle = null;
if (!isValid) {
state = {
width: defaultWidth,
height: defaultHeight,
};
state.width = defaultWidth;
state.height = defaultHeight;
displayBounds = screen.getPrimaryDisplay().bounds;
} else if (this.stateHasBounds(state) && state.displayBounds) {