From ef7033cac0e70743e09e164c3f6fd99b216027de Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 1 Feb 2023 16:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E5=9C=A8=E5=90=AF=E7=94=A8=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=E9=A1=B6=E9=83=A8=E6=97=B6=E7=9A=84=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                                            | 1 +
 src/renderer-lyric/components/layout/LyricHorizontal/index.vue  | 2 +-
 .../components/layout/LyricHorizontal/useLyric.js               | 2 +-
 src/renderer-lyric/components/layout/LyricVertical/index.vue    | 2 +-
 src/renderer-lyric/components/layout/LyricVertical/useLyric.js  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 6c9df6a2..1f295d94 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -8,6 +8,7 @@
 ### 优化
 
 - 微调了桌面歌词逐行字体阴影，使其看起来更匀称
+- 调整了桌面歌词在启用滚动到顶部时的距离，现在滚动到顶部的歌词更靠边，不再受字体大小、歌词间距影响
 - 优化更新弹窗内容的显示，添加了自动更新失败时的更新指引
 
 ### 修复
diff --git a/src/renderer-lyric/components/layout/LyricHorizontal/index.vue b/src/renderer-lyric/components/layout/LyricHorizontal/index.vue
index de90a834..f07f86f8 100644
--- a/src/renderer-lyric/components/layout/LyricHorizontal/index.vue
+++ b/src/renderer-lyric/components/layout/LyricHorizontal/index.vue
@@ -72,7 +72,7 @@ export default {
   :global {
     .font-lrc, .shadow {
       padding: 0.08em 0.14em;
-      margin: -0.08em -0.14em;
+      margin: -0.08em 0;
     }
     .font-lrc {
       color: var(--color-lyric-unplay);
diff --git a/src/renderer-lyric/components/layout/LyricHorizontal/useLyric.js b/src/renderer-lyric/components/layout/LyricHorizontal/useLyric.js
index 37bef6dd..bb287949 100644
--- a/src/renderer-lyric/components/layout/LyricHorizontal/useLyric.js
+++ b/src/renderer-lyric/components/layout/LyricHorizontal/useLyric.js
@@ -6,7 +6,7 @@ import { setWindowBounds } from '@lyric/utils/ipc'
 
 const getOffsetTop = (contentHeight, lineHeight) => {
   switch (setting['desktopLyric.scrollAlign']) {
-    case 'top': return setting['desktopLyric.style.lineGap'] / 2
+    case 'top': return 0
     default: return contentHeight * 0.5 - lineHeight / 2
   }
 }
diff --git a/src/renderer-lyric/components/layout/LyricVertical/index.vue b/src/renderer-lyric/components/layout/LyricVertical/index.vue
index c4515c28..113ff95c 100644
--- a/src/renderer-lyric/components/layout/LyricVertical/index.vue
+++ b/src/renderer-lyric/components/layout/LyricVertical/index.vue
@@ -77,7 +77,7 @@ export default {
   :global {
     .font-lrc, .shadow {
       padding: 0.14em 0.07em;
-      margin: -0.14em -0.07em;
+      margin: 0 -0.07em;
     }
     .font-lrc {
       color: var(--color-lyric-unplay);
diff --git a/src/renderer-lyric/components/layout/LyricVertical/useLyric.js b/src/renderer-lyric/components/layout/LyricVertical/useLyric.js
index 519daedc..9af28706 100644
--- a/src/renderer-lyric/components/layout/LyricVertical/useLyric.js
+++ b/src/renderer-lyric/components/layout/LyricVertical/useLyric.js
@@ -6,7 +6,7 @@ import { setWindowBounds } from '@lyric/utils/ipc'
 
 const getOffsetTop = (contentWidth, lineWidth) => {
   switch (setting['desktopLyric.scrollAlign']) {
-    case 'top': return contentWidth - lineWidth - lineWidth * 0.1
+    case 'top': return contentWidth - lineWidth
     default: return contentWidth * 0.5 - lineWidth / 2
   }
 }