Merge pull request RocketChat#137 from RocketChat/improvements/zoom

Add zoom options
HappyTobi · Mar 5, 2016 · 18c3d97 · 18c3d97
2 parents 6508a1c + e36a1d7
commit 18c3d97
Showing 1 changed file with 83 additions and 22 deletions.
diff --git a/app/scripts/menus.js b/app/scripts/menus.js
@@ -4,6 +4,7 @@ import { remote } from 'electron';
 import { servers } from './servers';
 import { sidebar } from './sidebar';
 import { webview } from './webview';
+import webFrame from 'web-frame';
 import config from './config';
 import '../branding/branding.js';
 
@@ -105,26 +106,37 @@ if (process.platform === 'darwin') {
 			label: 'View',
 			submenu: [
 				{
-					label: 'Reload current server',
-					accelerator: 'Command+R',
+					label: 'Original Zoom',
+					accelerator: 'Command+0',
 					click: function() {
-						const activeWebview = webview.getActive();
-						if (activeWebview) {
-							activeWebview.reload();
-						}
+						webFrame.setZoomLevel(0);
 					}
 				},
 				{
-					label: 'Reload application',
-					accelerator: 'Command+Shift+R',
+					label: 'Zoom In',
+					accelerator: 'Command+=',
 					click: function() {
-						remote.getCurrentWindow().reload();
+						webFrame.setZoomLevel(webFrame.getZoomLevel()+1);
 					}
 				},
 				{
-					label: 'Toggle server list',
+					label: 'Zoom Out',
+					accelerator: 'Command+-',
 					click: function() {
-						sidebar.toggle();
+						webFrame.setZoomLevel(webFrame.getZoomLevel()-1);
+					}
+				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Reload - current server',
+					accelerator: 'Command+R',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.reload();
+						}
 					}
 				},
 				{
@@ -137,11 +149,30 @@ if (process.platform === 'darwin') {
 						}
 					}
 				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Reload - application',
+					accelerator: 'Command+Shift+R',
+					click: function() {
+						remote.getCurrentWindow().reload();
+					}
+				},
 				{
 					label: 'Toggle DevTools - application',
 					click: function() {
 						remote.getCurrentWindow().toggleDevTools();
 					}
+				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Toggle server list',
+					click: function() {
+						sidebar.toggle();
+					}
 				}
 			]
 		},
@@ -237,26 +268,37 @@ if (process.platform === 'darwin') {
 			label: 'View',
 			submenu: [
 				{
-					label: 'Reload current server',
-					accelerator: 'Ctrl+R',
+					label: 'Original Zoom',
+					accelerator: 'Command+0',
 					click: function() {
-						const activeWebview = webview.getActive();
-						if (activeWebview) {
-							activeWebview.reload();
-						}
+						webFrame.setZoomLevel(0);
 					}
 				},
 				{
-					label: 'Reload application',
-					accelerator: 'Ctrl+Shift+R',
+					label: 'Zoom In',
+					accelerator: 'Command+=',
 					click: function() {
-						remote.getCurrentWindow().reload();
+						webFrame.setZoomLevel(webFrame.getZoomLevel()+1);
 					}
 				},
 				{
-					label: 'Toggle server list',
+					label: 'Zoom Out',
+					accelerator: 'Command+-',
 					click: function() {
-						sidebar.toggle();
+						webFrame.setZoomLevel(webFrame.getZoomLevel()-1);
+					}
+				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Reload - current server',
+					accelerator: 'Ctrl+R',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.reload();
+						}
 					}
 				},
 				{
@@ -269,11 +311,30 @@ if (process.platform === 'darwin') {
 						}
 					}
 				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Reload - application',
+					accelerator: 'Ctrl+Shift+R',
+					click: function() {
+						remote.getCurrentWindow().reload();
+					}
+				},
 				{
 					label: 'Toggle DevTools - application',
 					click: function() {
 						remote.getCurrentWindow().toggleDevTools();
 					}
+				},
+				{
+					type: 'separator'
+				},
+				{
+					label: 'Toggle server list',
+					click: function() {
+						sidebar.toggle();
+					}
 				}
 			]
 		},