From b02d32929c7c4f49c7d539fb93e03ead29a99c5d Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 26 Jun 2020 00:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/defaultHotKey.js        |  5 -----
 src/common/defaultSetting.js       | 12 ++++++------
 src/main/modules/winLyric/index.js |  6 +++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/common/defaultHotKey.js b/src/common/defaultHotKey.js
index ae220153..3d018533 100644
--- a/src/common/defaultHotKey.js
+++ b/src/common/defaultHotKey.js
@@ -24,11 +24,6 @@ module.exports = {
         name: hotKeyCommon.focusSearchInput.name,
         action: hotKeyCommon.focusSearchInput.action,
       },
-      'mod+w': {
-        type: hotKeyCommon.min.type,
-        name: hotKeyCommon.min.name,
-        action: hotKeyCommon.min.action,
-      },
     },
   },
   global: {
diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js
index b0f202cf..85aa7437 100644
--- a/src/common/defaultSetting.js
+++ b/src/common/defaultSetting.js
@@ -17,14 +17,14 @@ const defaultSetting = {
     enable: false,
     isLock: false,
     isAlwaysOnTop: false,
-    width: 600,
-    height: 700,
-    x: -1,
-    y: -1,
+    width: 380,
+    height: 420,
+    x: null,
+    y: null,
     theme: 0,
     style: {
-      fontSize: 125,
-      opacity: 80,
+      fontSize: 120,
+      opacity: 95,
       isZoomActiveLrc: true,
     },
   },
diff --git a/src/main/modules/winLyric/index.js b/src/main/modules/winLyric/index.js
index e4bb13a9..3a6d5c86 100644
--- a/src/main/modules/winLyric/index.js
+++ b/src/main/modules/winLyric/index.js
@@ -72,10 +72,14 @@ const createWindow = () => {
   if (global.modules.lyricWindow) return
   if (!global.appSetting.desktopLyric.enable) return
   // const windowSizeInfo = getWindowSizeInfo(global.appSetting)
-  const { x, y, width, height, isAlwaysOnTop } = global.appSetting.desktopLyric
+  let { x, y, width, height, isAlwaysOnTop } = global.appSetting.desktopLyric
   let { width: screenWidth, height: screenHeight } = global.envParams.workAreaSize
   screenWidth += 16
   screenHeight += 16
+  if (x == null) {
+    x = screenWidth - width - 8
+    y = screenHeight - height - 8
+  }
   /**
    * Initial window options
    */