Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-22 11:45:59 +01:00
Code Issues Projects Releases Wiki Activity

[PS-1874] Manage zoom factor when opening / closing the application (#4050)

Browse Source 
* fix: manage zoom factor when opening / closing the application

* Fix zoom factor type and removed useless instruction

* Specified WindowState as the type of windowStates
This commit is contained in:
CristianAUnisa 2022-12-16 00:20:10 +01:00 committed by GitHub
parent d8a121463e
commit 8a1230b959
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/desktop/src/main/window.main.ts
View File

@ -5,6 +5,7 @@ import { app, BrowserWindow, screen } from "electron";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { WindowState } from "@bitwarden/common/models/domain/window-state";
import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "../utils";
@ -13,9 +14,10 @@ const WindowEventHandlingDelay = 100;
export class WindowMain {
win: BrowserWindow;
isQuitting = false;
isClosing = false;
private windowStateChangeTimer: NodeJS.Timer;
private windowStates: { [key: string]: any } = {};
private windowStates: { [key: string]: WindowState } = {};
private enableAlwaysOnTop = false;
constructor(
@ -128,6 +130,10 @@ export class WindowMain {
},
});
this.win.webContents.on("dom-ready", () => {
this.win.webContents.zoomFactor = this.windowStates[mainWindowSizeKey].zoomFactor ?? 1.0;
});
if (this.windowStates[mainWindowSizeKey].isMaximized) {
this.win.maximize();
}
@ -154,6 +160,7 @@ export class WindowMain {
// Emitted when the window is closed.
this.win.on("closed", async () => {
this.isClosing = false;
await this.updateWindowState(mainWindowSizeKey, this.win);
// Dereference the window object, usually you would store window
@ -163,6 +170,7 @@ export class WindowMain {
});
this.win.on("close", async () => {
this.isClosing = true;
await this.updateWindowState(mainWindowSizeKey, this.win);
});
@ -217,7 +225,7 @@ export class WindowMain {
if (this.windowStates[configKey] == null) {
this.windowStates[configKey] = await this.stateService.getWindow();
if (this.windowStates[configKey] == null) {
this.windowStates[configKey] = {};
this.windowStates[configKey] = <WindowState>{};
}
}
@ -231,6 +239,10 @@ export class WindowMain {
this.windowStates[configKey].height = bounds.height;
}
if (this.isClosing) {
this.windowStates[configKey].zoomFactor = win.webContents.zoomFactor;
}
await this.stateService.setWindow(this.windowStates[configKey]);
} catch (e) {
this.logService.error(e);

1
libs/common/src/models/domain/window-state.ts
View File

@ -7,4 +7,5 @@ export class WindowState {
displayBounds: any;
x?: number;
y?: number;
zoomFactor?: number;
}