From db38db9256fb02b5986f82c7d6b5af86639802bc Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 11 Jan 2023 13:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=8C=E9=9D=A2=E6=AD=8C?= =?UTF-8?q?=E8=AF=8D=E5=90=AF=E7=94=A8=E6=AD=8C=E8=AF=8D=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=98=B4=E5=BD=B1=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=E5=B0=B1=E6=94=BE=E6=A1=8C=E9=9D=A2=E6=AD=8C?= =?UTF-8?q?=E8=AF=8D=E5=9C=A8=E5=90=AF=E7=94=A8=E5=8D=A1=E6=8B=89OK?= =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E5=90=8E=E5=AD=97=E4=BD=93=E8=BE=B9=E7=BC=98?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=A2=AB=E6=88=AA=E6=96=AD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 2 ++ src/common/utils/lyric-font-player/font-player.js | 2 +- .../components/layout/LyricHorizontal/index.vue | 12 ++++++++++-- .../components/layout/LyricVertical/index.vue | 9 +++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 644d4222..ec1b572d 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -3,3 +3,5 @@ - 修复备份文件导入指引无法识别v2配置的问题 - 修复从搜索界面进入歌单详情后，若启用强迫症设置的清空功能会导致意外清空搜索框、搜索列表的问题 +- 就放桌面歌词在启用卡拉OK歌词后字体边缘可能被截断的问题 +- 修复桌面歌词启用歌词缩放后的阴影显示问题 diff --git a/src/common/utils/lyric-font-player/font-player.js b/src/common/utils/lyric-font-player/font-player.js index ea1ec4ec..98553ea5 100644 --- a/src/common/utils/lyric-font-player/font-player.js +++ b/src/common/utils/lyric-font-player/font-player.js @@ -159,7 +159,7 @@ module.exports = class FontPlayer { } if (this.shadowContent && lrcShadowContent) { - lrcShadowContent.style = 'position:absolute;top:0;left:0;width:100%;z-index:-1;' + lrcShadowContent.style = 'position:absolute;top:0;left:0;right:0;z-index:-1;' lrcShadowContent.className = this.shadowClassName this.line.appendChild(lrcShadowContent) } diff --git a/src/renderer-lyric/components/layout/LyricHorizontal/index.vue b/src/renderer-lyric/components/layout/LyricHorizontal/index.vue index a0dcddc5..55e2c6e6 100644 --- a/src/renderer-lyric/components/layout/LyricHorizontal/index.vue +++ b/src/renderer-lyric/components/layout/LyricHorizontal/index.vue @@ -76,7 +76,7 @@ export default { } .shadow { color: transparent; - margin-left: -0.14em; + // margin-left: -0.14em; } .line-content { line-height: 1.2; @@ -119,8 +119,16 @@ export default { -webkit-text-fill-color: transparent; -webkit-background-clip: text; background-size: 0 100%; + padding-left: 1px; + padding-right: 1px; + padding-bottom: 1px; } } + .line .shadow span { + padding-left: 1px; + padding-right: 1px; + padding-bottom: 1px; + } // &.line-mode { // .shadow { // text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.40); @@ -138,7 +146,7 @@ export default { // .stroke(2px, rgba(0, 0, 0, 0.025)); transition: font-size @transition-slow; } - .font-mode .line .shadow { + .font-mode .line .shadow span { .stroke(1px, var(--color-lyric-shadow-font-mode)); transition: font-size @transition-slow; // text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3), 1px 1px 1px rgba(0, 0, 0, 0.3); diff --git a/src/renderer-lyric/components/layout/LyricVertical/index.vue b/src/renderer-lyric/components/layout/LyricVertical/index.vue index 8054660b..00cbb394 100644 --- a/src/renderer-lyric/components/layout/LyricVertical/index.vue +++ b/src/renderer-lyric/components/layout/LyricVertical/index.vue @@ -86,7 +86,6 @@ export default { line-height: 1.2; margin: 0 var(--line-gap); overflow-wrap: break-word; - letter-spacing: 5px; .font-lrc { cursor: grab; @@ -97,6 +96,7 @@ export default { margin-right: var(--line-extended-gap); } &.line-mode { + letter-spacing: 5px; .font-lrc { transition: @transition-slow; transition-property: font-size, color; @@ -124,8 +124,13 @@ export default { -webkit-text-fill-color: transparent; -webkit-background-clip: text; background-size: 0 100%; + padding: 2px; } } + + &.font-mode .line .shadow span { + padding: 2px; + } } // .shadow { // .stroke2(rgba(0, 0, 0, 0.05)); @@ -143,7 +148,7 @@ export default { // .stroke(2px, rgba(0, 0, 0, 0.025)); transition: font-size @transition-slow; } - .font-mode .line .shadow { + .font-mode .line .shadow span { .stroke(1px, var(--color-lyric-shadow-font-mode)); // .stroke(1px, rgba(0, 0, 0, 0.07)); transition: font-size @transition-slow;