1
0
mirror of https://github.com/bitwarden/browser synced 2026-03-01 19:11:22 +00:00

Protecting against null API's and undefined data

This commit is contained in:
Anders Åberg
2024-10-10 14:48:44 +02:00
parent 895607f828
commit cf8d5b2146

View File

@@ -9,8 +9,8 @@ export function applyPopupModalStyles(window: BrowserWindow) {
window.unmaximize();
window.setSize(popupWidth, popupHeight);
window.center();
window.setWindowButtonVisibility(false);
window.setMenuBarVisibility(false);
window.setWindowButtonVisibility?.(false);
window.setMenuBarVisibility?.(false);
window.setResizable(false);
window.setAlwaysOnTop(true);
@@ -26,10 +26,19 @@ export function applyPopupModalStyles(window: BrowserWindow) {
export function applyMainWindowStyles(window: BrowserWindow, existingWindowState: WindowState) {
window.setMinimumSize(400, 400);
window.setSize(existingWindowState.width, existingWindowState.height);
window.setPosition(existingWindowState.x, existingWindowState.y);
window.setWindowButtonVisibility(true);
window.setMenuBarVisibility(true);
// need to guard against null/undefined values
if (existingWindowState) {
if (existingWindowState.width && existingWindowState.height) {
window.setSize(existingWindowState.width, existingWindowState.height);
}
if (existingWindowState.x && existingWindowState.y) {
window.setPosition(existingWindowState.x, existingWindowState.y);
}
}
window.setWindowButtonVisibility?.(true);
window.setMenuBarVisibility?.(true);
window.setResizable(true);
window.setAlwaysOnTop(false);