Merge pull request #941 from RocketChat/fix/window-closing-behavior

[FIX] Window closing behavior for Linux environments without a system tray
RocketChat · Oct 22, 2018 · 0bf4128 · 0bf4128
2 parents 4ed6120 + ddbaaea
commit 0bf4128
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/background/mainWindow.js b/src/background/mainWindow.js
@@ -11,7 +11,7 @@ import windowStateKeeper from './windowState';
 import env from '../env';
 
 let mainWindow = null;
-let hideOnClose = true;
+let hideOnClose = false;
 
 const mainWindowOptions = {
 	width: 1000,
@@ -49,11 +49,11 @@ const attachWindowStateHandling = (mainWindow) => {
 		event.preventDefault();
 		if (mainWindow.isFullScreen()) {
 			mainWindow.once('leave-full-screen', () => {
-				(process.platform === 'darwin' || hideOnClose) ? mainWindow.hide() : mainWindow.destroy();
+				(process.platform === 'darwin' || hideOnClose) ? mainWindow.hide() : mainWindow.minimize();
 			});
 			mainWindow.setFullScreen(false);
 		} else {
-			(process.platform === 'darwin' || hideOnClose) ? mainWindow.hide() : mainWindow.destroy();
+			(process.platform === 'darwin' || hideOnClose) ? mainWindow.hide() : mainWindow.minimize();
 		}
 		mainWindowState.saveState(mainWindow);
 	});

diff --git a/src/scripts/events.js b/src/scripts/events.js
@@ -70,7 +70,8 @@ export default () => {
 		const mainWindow = getCurrentWindow();
 
 		menus.setState({
-			showTrayIcon: localStorage.getItem('hideTray') !== 'true',
+			showTrayIcon: localStorage.getItem('hideTray') ?
+				localStorage.getItem('hideTray') !== 'true' : (process.platform !== 'linux'),
 			showUserStatusInTray: (localStorage.getItem('showUserStatusInTray') || 'true') === 'true',
 			showFullScreen: mainWindow.isFullScreen(),
 			showWindowOnUnreadChanged: localStorage.getItem('showWindowOnUnreadChanged') === 'true',
@@ -79,7 +80,8 @@ export default () => {
 		});
 
 		tray.setState({
-			showIcon: localStorage.getItem('hideTray') !== 'true',
+			showIcon: localStorage.getItem('hideTray') ?
+				localStorage.getItem('hideTray') !== 'true' : (process.platform !== 'linux'),
 			showUserStatus: (localStorage.getItem('showUserStatusInTray') || 'true') === 'true',
 		});
 	};