mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Change tray icon click to always show/focus window (#2984)

Browse source 
* Added function to always show the window on tray icon click and reassigned click event

* Refactored the code to force the window on top into its own function
This commit is contained in:
Herohtar 2019-01-02 16:42:31 -06:00 • committed by Scott Nonnenberg
parent a21d63e450
commit 22ca4f9cc7
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/tray_icon.js
View file

@ -17,6 +17,17 @@ function createTrayIcon(getMainWindow, messages) {
tray = new Tray(iconNoNewMessages);
tray.forceOnTop = mainWindow => {
if (mainWindow) {
// On some versions of GNOME the window may not be on top when restored.
// This trick should fix it.
// Thanks to: https://github.com/Enrico204/Whatsapp-Desktop/commit/6b0dc86b64e481b455f8fce9b4d797e86d000dc1
mainWindow.setAlwaysOnTop(true);
mainWindow.focus();
mainWindow.setAlwaysOnTop(false);
}
}
tray.toggleWindowVisibility = () => {
const mainWindow = getMainWindow();
if (mainWindow) {
@ -25,17 +36,24 @@ function createTrayIcon(getMainWindow, messages) {
} else {
mainWindow.show();
// On some versions of GNOME the window may not be on top when restored.
// This trick should fix it.
// Thanks to: https://github.com/Enrico204/Whatsapp-Desktop/commit/6b0dc86b64e481b455f8fce9b4d797e86d000dc1
mainWindow.setAlwaysOnTop(true);
mainWindow.focus();
mainWindow.setAlwaysOnTop(false);
tray.forceOnTop(mainWindow);
}
}
tray.updateContextMenu();
};
tray.showWindow = () => {
const mainWindow = getMainWindow();
if (mainWindow) {
if (!mainWindow.isVisible()) {
mainWindow.show();
}
tray.forceOnTop(mainWindow);
}
tray.updateContextMenu();
};
tray.updateContextMenu = () => {
const mainWindow = getMainWindow();
@ -70,7 +88,7 @@ function createTrayIcon(getMainWindow, messages) {
}
};
tray.on('click', tray.toggleWindowVisibility);
tray.on('click', tray.showWindow);
tray.setToolTip(messages.trayTooltip.message);
tray.updateContextMenu();