Merge pull request #635 from yuya-oc/fix-zoom-issue

Keep MainWindow's zoom level to zero excepting webview

CHANGELOG.md

@@ -41,6 +41,8 @@ Release date: TBD
  [#497](https://github.com/mattermost/desktop/issues/497)
  - Fixed an issue where unnecessary focus remains after closing dialogs on the settings page.
  [#446](https://github.com/mattermost/desktop/issues/446)
+ - Fixed an issue where there is a case of that modified font size causes wrong rendering.
+ [#334](https://github.com/mattermost/desktop/issues/334)
 
 #### Windows
  - Fixed desktop notifications not working when the window has been minimized from inactive state.

src/browser/components/MainPage.jsx

@@ -329,7 +329,10 @@ const MainPage = createReactClass({
       />
     );
     return (
-      <div className='MainPage'>
+      <div
+        className='MainPage'
+        onClick={this.focusOnWebView}
+      >
         <LoginModal
           show={this.state.loginQueue.length !== 0}
           request={request}

src/main/mainWindow.js

@@ -66,6 +66,7 @@ function createMainWindow(config, options) {
   });
 
   mainWindow.once('ready-to-show', () => {
+    mainWindow.webContents.setZoomLevel(0);
     if (process.platform !== 'darwin') {
       mainWindow.show();
     } else if (options.hideOnStartup !== true) {