Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-12 13:39:14 +01:00
Code Issues Projects Releases Wiki Activity

MacOS: Closing with red button won't open window again through tray icon (#40)

Browse Source 
* Fixed issue on MacOS where closing BW via the red button then reopening using tray icon wouldn't work

* Added MacOS only condition to the window recreation of the toggleWindow method. Made createWindow public in WindowMain.
This commit is contained in:
Michael Honan 2019-05-16 12:44:25 +10:00 committed by Kyle Spearrin
parent 741e060d99
commit 1bcd430884
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/electron/tray.main.ts
View File

@ -121,16 +121,21 @@ export class TrayMain {
} }
private toggleWindow() { private toggleWindow() {
if (this.windowMain.win == null) { if (this.windowMain.win === null) {
return; if (process.platform === 'darwin') {
// On MacOS, closing the window via the red button destroys the BrowserWindow instance.
this.windowMain.createWindow().then(() => {
this.windowMain.win.show();
});
} }
} else {
if (this.windowMain.win.isVisible()) { if (this.windowMain.win.isVisible()) {
this.windowMain.win.hide(); this.windowMain.win.hide();
} else { } else {
this.windowMain.win.show(); this.windowMain.win.show();
} }
} }
}
private closeWindow() { private closeWindow() {
this.windowMain.isQuitting = true; this.windowMain.isQuitting = true;

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

@ -81,7 +81,7 @@ export class WindowMain {
}); });
} }
private async createWindow() { async createWindow(): Promise<void> {
this.windowStates[Keys.mainWindowSize] = await this.getWindowState(Keys.mainWindowSize, this.defaultWidth, this.windowStates[Keys.mainWindowSize] = await this.getWindowState(Keys.mainWindowSize, this.defaultWidth,
this.defaultHeight); this.defaultHeight);