From 21ffa1d17c59cbc4005f2bdece7fb3f1871ec4cc Mon Sep 17 00:00:00 2001
From: ChenYarong <chenyarong@haochang.tv>
Date: Tue, 5 Nov 2019 11:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E4=BA=8Eproduction=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9B=E8=A1=8C=E5=8A=9F=E8=83=BD=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ 增加Ctrl+I定位输入
+ 去掉菜单上面的Download区域
---
 src/common.js                     | 1 +
 src/common_cn.js                  | 1 +
 src/handlers/menu.js              | 7 +++++++
 src/inject/css.js                 | 6 ++++++
 src/inject/preload.js             | 2 +-
 src/windows/controllers/wechat.js | 2 +-
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/common.js b/src/common.js
index cb5fd83c..c2e8262c 100644
--- a/src/common.js
+++ b/src/common.js
@@ -90,6 +90,7 @@ Common.MENU = {
   reload: 'Reload This Window',
   toggleFullScreen:'Toggle Full Screen',
   searchContacts:'Search Contacts',
+  inputContents: 'input Contents',
   devtool: 'Toggle DevTools',
   window: 'Window',
   min: 'Minimize',
diff --git a/src/common_cn.js b/src/common_cn.js
index 11c354e1..ca4934e9 100644
--- a/src/common_cn.js
+++ b/src/common_cn.js
@@ -82,6 +82,7 @@ Common.MENU = {
   reload: '重新加载当前窗口',
   toggleFullScreen:'切换全屏',
   searchContacts:'搜索联系人',
+  inputContents: '输入聊天内容',
   devtool: '开发者工具',
   window: '窗口',
   min: '最小化',
diff --git a/src/handlers/menu.js b/src/handlers/menu.js
index 71fe49fc..e2bc038b 100644
--- a/src/handlers/menu.js
+++ b/src/handlers/menu.js
@@ -216,6 +216,13 @@ class MenuHandler {
               $('#search_bar input')[0].focus();
             },
           },
+          {
+            label: Common.MENU.inputContents,
+            accelerator: 'Ctrl+I',
+            click: () => {
+              $('#editArea').focus();
+            }
+          },
           {
             label: Common.MENU.devtool,
             accelerator: 'Ctrl+Shift+I',
diff --git a/src/inject/css.js b/src/inject/css.js
index eb482dac..6a1f12f4 100644
--- a/src/inject/css.js
+++ b/src/inject/css.js
@@ -8,6 +8,12 @@ class CSSInjector {
 }
 
 CSSInjector.commonCSS = `
+    div.download_entry {
+      display: none;
+    }
+    div.nav_view {
+      top: 154px !important;
+    }
     div.header, div.title_wrap {
         -webkit-app-region: drag;
     }
diff --git a/src/inject/preload.js b/src/inject/preload.js
index 05dfaac1..6b953bfc 100644
--- a/src/inject/preload.js
+++ b/src/inject/preload.js
@@ -19,7 +19,7 @@ class Injector {
     this.initAngularInjection();
     this.lastUser = null;
     this.initIPC();
-    webFrame.setZoomLevelLimits(1, 1);
+    webFrame.setZoomLevel(0)
 
     new MenuHandler().create();
   }
diff --git a/src/windows/controllers/wechat.js b/src/windows/controllers/wechat.js
index fbd84d51..af56cf4f 100644
--- a/src/windows/controllers/wechat.js
+++ b/src/windows/controllers/wechat.js
@@ -38,8 +38,8 @@ class WeChatWindow {
   resizeWindow(isLogged, splashWindow) {
     const size = isLogged ? Common.WINDOW_SIZE : Common.WINDOW_SIZE_LOGIN;
 
-    this.wechatWindow.setResizable(isLogged);
     this.wechatWindow.setSize(size.width, size.height);
+    this.wechatWindow.setResizable(isLogged);
     if (this.loginState.current === 1 - isLogged || this.loginState.current === this.loginState.WAITING) {
       splashWindow.hide();
       this.show();