aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/Tray.js
diff options
context:
space:
mode:
authorLibravatar skoruppa <skoruppa@gmail.com>2019-03-08 18:04:25 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-03-08 08:04:25 -0800
commit5b02c4d3304a570562d4dd089e46624a58697f1f (patch)
tree77c5f5125c283a5305abd83fe413ab7861b7f5a3 /src/lib/Tray.js
parentcorrectly update services submenu on language change (diff)
downloadferdium-app-5b02c4d3304a570562d4dd089e46624a58697f1f.tar.gz
ferdium-app-5b02c4d3304a570562d4dd089e46624a58697f1f.tar.zst
ferdium-app-5b02c4d3304a570562d4dd089e46624a58697f1f.zip
fix(Linux): Fix minimized window focusing (#1304) (@skoruppa)
* trigger build * Check if window is minimized before restoring it * restore() should be executed only when window is minimized
Diffstat (limited to 'src/lib/Tray.js')
-rw-r--r--src/lib/Tray.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 669b02709..192e24796 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -22,7 +22,11 @@ export default class TrayIcon {
22 { 22 {
23 label: 'Show Franz', 23 label: 'Show Franz',
24 click() { 24 click() {
25 if (app.mainWindow.isMinimized()) {
26 app.mainWindow.restore();
27 }
25 app.mainWindow.show(); 28 app.mainWindow.show();
29 app.mainWindow.focus();
26 }, 30 },
27 }, { 31 }, {
28 label: 'Quit Franz', 32 label: 'Quit Franz',
@@ -36,7 +40,11 @@ export default class TrayIcon {
36 this.trayIcon.setContextMenu(trayMenu); 40 this.trayIcon.setContextMenu(trayMenu);
37 41
38 this.trayIcon.on('click', () => { 42 this.trayIcon.on('click', () => {
43 if (app.mainWindow.isMinimized()) {
44 app.mainWindow.restore();
45 }
39 app.mainWindow.show(); 46 app.mainWindow.show();
47 app.mainWindow.focus();
40 }); 48 });
41 49
42 if (process.platform === 'darwin') { 50 if (process.platform === 'darwin') {