From 8ab1bdf30acd0b72c0aeea79236c1e6909898695 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 5 May 2022 16:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E2=80=9C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2=E5=8A=A8=E7=94=BB=E2=80=9D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E8=AF=A5=E8=AE=BE=E7=BD=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=A2=AB=E5=BA=94=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                         |  1 +
 src/renderer/App.vue                         | 30 +-----------------
 src/renderer/core/useApp/useEventListener.js | 33 ++++++++++++++++++--
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index cc03f0a5..81342210 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,3 +6,4 @@
 ### 修复
 
 - 修复某些情况下歌曲播放出错时不会自动切歌的问题
+- 修复关闭“显示切换动画”设置后，在应用启动时该设置没有被应用的问题
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 91727835..b99a62dd 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -14,41 +14,13 @@
 </template>
 
 <script>
-import { useRefGetter, watch, onMounted } from '@renderer/utils/vueTools'
+import { onMounted } from '@renderer/utils/vueTools'
 import useApp from '@renderer/core/useApp'
-import { isFullscreen } from '@renderer/core/share'
-import { getFontSizeWithScreen } from '@renderer/utils'
 
 export default {
   setup() {
-    const theme = useRefGetter('theme')
-    const font = useRefGetter('font')
-    const windowSizeActive = useRefGetter('windowSizeActive')
-
     const dom_root = document.getElementById('root')
 
-    watch(theme, (val) => {
-      dom_root.className = val
-    })
-    watch(font, (val) => {
-      document.documentElement.style.fontFamily = val
-    }, {
-      immediate: true,
-    })
-    watch(isFullscreen, val => {
-      if (val) {
-        document.body.classList.remove(window.dt ? 'disableTransparent' : 'transparent')
-        document.body.classList.add('fullscreen')
-        document.documentElement.style.fontSize = getFontSizeWithScreen(window.screen.width) + 'px'
-      } else {
-        document.body.classList.remove('fullscreen')
-        document.body.classList.add(window.dt ? 'disableTransparent' : 'transparent')
-        document.documentElement.style.fontSize = windowSizeActive.value.fontSize
-      }
-    }, {
-      immediate: true,
-    })
-
     useApp()
 
     onMounted(() => {
diff --git a/src/renderer/core/useApp/useEventListener.js b/src/renderer/core/useApp/useEventListener.js
index 3f661d85..4de6eddc 100644
--- a/src/renderer/core/useApp/useEventListener.js
+++ b/src/renderer/core/useApp/useEventListener.js
@@ -1,4 +1,4 @@
-import { openUrl } from '@renderer/utils'
+import { openUrl, getFontSizeWithScreen } from '@renderer/utils'
 import { base as eventBaseName } from '@renderer/event/names'
 import { onSetConfig, onSystemThemeChange } from '@renderer/utils/tools'
 import { isFullscreen, themeShouldUseDarkColors } from '@renderer/core/share'
@@ -44,10 +44,37 @@ export default ({
   isProd,
   isLinux,
 }) => {
-  const setSetting = useCommit('setSetting')
+  const theme = useRefGetter('theme')
+  const font = useRefGetter('font')
   const windowSizeActive = useRefGetter('windowSizeActive')
+  const setSetting = useCommit('setSetting')
   const isShowAnimation = useRefGetter('isShowAnimation')
 
+  const dom_root = document.getElementById('root')
+
+
+  watch(theme, (val) => {
+    dom_root.className = val
+  })
+  watch(font, (val) => {
+    document.documentElement.style.fontFamily = val
+  }, {
+    immediate: true,
+  })
+  watch(isFullscreen, val => {
+    if (val) {
+      document.body.classList.remove(window.dt ? 'disableTransparent' : 'transparent')
+      document.body.classList.add('fullscreen')
+      document.documentElement.style.fontSize = getFontSizeWithScreen(window.screen.width) + 'px'
+    } else {
+      document.body.classList.remove('fullscreen')
+      document.body.classList.add(window.dt ? 'disableTransparent' : 'transparent')
+      document.documentElement.style.fontSize = windowSizeActive.value.fontSize
+    }
+  }, {
+    immediate: true,
+  })
+
   watch(windowSizeActive, ({ fontSize }) => {
     document.documentElement.style.fontSize = fontSize
   })
@@ -61,6 +88,8 @@ export default ({
         document.body.classList.add('disableAnimation')
       }
     }
+  }, {
+    immediate: true,
   })
 
   const rSetConfig = onSetConfig((event, config) => {