Use default electron implementation for zoomin, zoomout and resetzoom
See: https://github.com/electron/electron/pull/6777
This commit is contained in:
@@ -386,9 +386,6 @@ var MattermostView = React.createClass({
|
|||||||
webview.addEventListener("dom-ready", function() {
|
webview.addEventListener("dom-ready", function() {
|
||||||
// webview.openDevTools();
|
// webview.openDevTools();
|
||||||
|
|
||||||
// In order to apply the zoom level to webview.
|
|
||||||
webFrame.setZoomLevel(parseInt(localStorage.getItem('zoomLevel')));
|
|
||||||
|
|
||||||
// Use 'Meiryo UI' and 'MS Gothic' to prevent CJK fonts on Windows(JP).
|
// Use 'Meiryo UI' and 'MS Gothic' to prevent CJK fonts on Windows(JP).
|
||||||
if (process.platform === 'win32') {
|
if (process.platform === 'win32') {
|
||||||
var applyCssFile = function(cssFile) {
|
var applyCssFile = function(cssFile) {
|
||||||
@@ -662,22 +659,6 @@ var showUnreadBadge = function(unreadCount, mentionCount) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!localStorage.getItem('zoomLevel')) {
|
|
||||||
localStorage.setItem('zoomLevel', 0);
|
|
||||||
}
|
|
||||||
webFrame.setZoomLevel(parseInt(localStorage.getItem('zoomLevel')));
|
|
||||||
|
|
||||||
ipcRenderer.on('zoom-in', (event, increment) => {
|
|
||||||
const zoomLevel = webFrame.getZoomLevel() + increment
|
|
||||||
webFrame.setZoomLevel(zoomLevel);
|
|
||||||
localStorage.setItem('zoomLevel', zoomLevel);
|
|
||||||
});
|
|
||||||
|
|
||||||
ipcRenderer.on('zoom-reset', (event) => {
|
|
||||||
webFrame.setZoomLevel(0);
|
|
||||||
localStorage.setItem('zoomLevel', 0);
|
|
||||||
});
|
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<MainPage teams={ config.teams } onUnreadCountChange={ showUnreadBadge } />,
|
<MainPage teams={ config.teams } onUnreadCountChange={ showUnreadBadge } />,
|
||||||
document.getElementById('content')
|
document.getElementById('content')
|
||||||
|
@@ -112,30 +112,16 @@ var createTemplate = function(mainWindow, config) {
|
|||||||
}, {
|
}, {
|
||||||
role: 'togglefullscreen'
|
role: 'togglefullscreen'
|
||||||
}, separatorItem, {
|
}, separatorItem, {
|
||||||
label: 'Actual Size',
|
role: 'resetzoom'
|
||||||
accelerator: 'CmdOrCtrl+0',
|
|
||||||
click: () => {
|
|
||||||
mainWindow.webContents.send('zoom-reset');
|
|
||||||
}
|
|
||||||
}, {
|
}, {
|
||||||
label: 'Zoom In',
|
role: 'zoomin'
|
||||||
accelerator: 'CmdOrCtrl+Plus',
|
|
||||||
click: () => {
|
|
||||||
mainWindow.webContents.send('zoom-in', 1);
|
|
||||||
}
|
|
||||||
}, {
|
}, {
|
||||||
label: 'Zoom In (hidden)',
|
label: 'Zoom In (hidden)',
|
||||||
accelerator: 'CmdOrCtrl+=',
|
accelerator: 'CmdOrCtrl+=',
|
||||||
visible: false,
|
visible: false,
|
||||||
click: () => {
|
role: 'zoomin'
|
||||||
mainWindow.webContents.send('zoom-in', 1);
|
|
||||||
}
|
|
||||||
}, {
|
}, {
|
||||||
label: 'Zoom Out',
|
role: 'zoomout'
|
||||||
accelerator: 'CmdOrCtrl+-',
|
|
||||||
click: () => {
|
|
||||||
mainWindow.webContents.send('zoom-in', -1);
|
|
||||||
}
|
|
||||||
}, separatorItem, {
|
}, separatorItem, {
|
||||||
label: 'Toggle Developer Tools',
|
label: 'Toggle Developer Tools',
|
||||||
accelerator: (function() {
|
accelerator: (function() {
|
||||||
|
Reference in New Issue
Block a user