From f7add8370f7b96a2b1edf8b8ffc524f9f1284345 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Fri, 27 Oct 2017 21:37:56 +0900
Subject: [PATCH 1/2] Keep MainWindow's zoom level to zero excepting webview

---
 src/browser/components/MainPage.jsx | 5 ++++-
 src/main/mainWindow.js              | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx
index 4786919e..60d906f5 100644
--- a/src/browser/components/MainPage.jsx
+++ b/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}
diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js
index ae62f3a6..e5c62b2a 100644
--- a/src/main/mainWindow.js
+++ b/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) {

From 43055f8d4aacf95ec5fa20ae42d47ae1300bf30d Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Wed, 1 Nov 2017 02:22:44 +0900
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c28ccda..e8ba70d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,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.