Close RocketChat#151; Restoring maximized window from tray restores t…

…o not maximized window size
HappyTobi · Apr 5, 2016 · 979d405 · 979d405
1 parent 0b86ae9
commit 979d405
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/app/background.js b/app/background.js
@@ -3,7 +3,7 @@
 // It doesn't have any windows which you can see on screen, but we can open
 // window from here.
 
-import { app, BrowserWindow, dialog } from 'electron';
+import { app, BrowserWindow } from 'electron';
 import devHelper from './vendor/electron_boilerplate/dev_helper';
 import windowStateKeeper from './vendor/electron_boilerplate/window_state';
 import certificate from './certificate';
@@ -18,7 +18,6 @@ if (process.platform !== 'darwin') {
     var shouldQuit = app.makeSingleInstance(function() {
         // Someone tried to run a second instance, we should focus our window.
         if (mainWindow) {
-            mainWindow.restore();
             mainWindow.show();
             mainWindow.focus();
         }

diff --git a/app/scripts/menus.js b/app/scripts/menus.js
@@ -211,7 +211,6 @@ if (process.platform === 'darwin') {
 					accelerator: 'Command+N',
 					click: function() {
 						var mainWindow = remote.getCurrentWindow();
-						mainWindow.restore();
 						mainWindow.show();
 						servers.clearActive();
 					}
@@ -223,7 +222,6 @@ if (process.platform === 'darwin') {
 					label: 'Bring All to Front',
 					click: function() {
 						var mainWindow = remote.getCurrentWindow();
-						mainWindow.restore();
 						mainWindow.show();
 					}
 				}

diff --git a/app/scripts/sidebar.js b/app/scripts/sidebar.js
@@ -112,7 +112,6 @@ class SideBar extends EventEmitter {
 			id: host.url,
 			click: () => {
 				var mainWindow = remote.getCurrentWindow();
-				mainWindow.restore();
 				mainWindow.show();
 				this.emit('click', host.url);
 				servers.setActive(host.url);

diff --git a/app/scripts/tray.js b/app/scripts/tray.js
@@ -36,7 +36,6 @@ function createAppTray() {
     }, {
         label: 'Show',
         click: function() {
-            mainWindow.restore();
             mainWindow.show();
         }
     }, {
@@ -50,7 +49,6 @@ function createAppTray() {
 
     if (process.platform === 'darwin' || process.platform === 'win32') {
         _tray.on('double-click', function() {
-            mainWindow.restore();
             mainWindow.show();
         });
     } else {
@@ -65,7 +63,6 @@ function createAppTray() {
             } else {
                 clearTimeout(dblClickTimeoutFct);
                 dblClickTimeoutFct = null;
-                mainWindow.restore();
                 mainWindow.show();
             }
         });