diff --git a/publish/changeLog.md b/publish/changeLog.md index 243caf63..5fe348fd 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -3,6 +3,7 @@ - 新增“便携”功能,在Windows平台下,若程序目录下存在 portable 目录,则自动使用此目录作为数据存储目录 - 新增 Scheme URL 支持,同时发布lx-music-script项目配合使用(一个油猴脚本,可以在浏览器中的官方平台网页直接调用LX Music),Scheme URL的调用说明看Readme.md文档的Scheme URL支持部分 - 新增启动参数`-proxy-server`与`-proxy-bypass-list`,详细介绍看Readme.md文档的启动参数部分 +- 新增桌面歌词是否延迟滚动设置,默认开启,若你不想要桌面歌词延迟滚动可以去设置-桌面歌词设置关掉 ### 优化 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index e505c020..306a30f4 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -2,7 +2,7 @@ const path = require('path') const os = require('os') const defaultSetting = { - version: '1.0.47', + version: '1.0.48', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -27,6 +27,7 @@ const defaultSetting = { y: null, theme: 0, isLockScreen: true, + isDelayScroll: true, style: { font: '', fontSize: 120, diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 2bffc144..efa873e6 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -230,6 +230,7 @@ "setting__click_open": "Click to open", "setting__desktop_lyric": "Desktop Lyric Settings", "setting__desktop_lyric_always_on_top": "Make the lyrics always above other windows", + "setting__desktop_lyric_delay_scroll": "Delayed lyrics scroll", "setting__desktop_lyric_enable": "Display lyrics", "setting__desktop_lyric_font": "Lyric font", "setting__desktop_lyric_font_default": "Default", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 7910355a..0a4f33b4 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -230,6 +230,7 @@ "setting__click_open": "点击打开", "setting__desktop_lyric": "桌面歌词设置", "setting__desktop_lyric_always_on_top": "使歌词总是在其他窗口之上", + "setting__desktop_lyric_delay_scroll": "延迟歌词滚动", "setting__desktop_lyric_enable": "显示歌词", "setting__desktop_lyric_font": "歌词字体", "setting__desktop_lyric_font_default": "默认", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index fbdbd86b..bd2f2660 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -230,6 +230,7 @@ "setting__click_open": "點擊打開", "setting__desktop_lyric": "桌面歌詞設置", "setting__desktop_lyric_always_on_top": "使歌詞總是在其他窗口之上", + "setting__desktop_lyric_delay_scroll": "延遲歌詞滾動", "setting__desktop_lyric_enable": "顯示歌詞", "setting__desktop_lyric_font": "歌詞字體", "setting__desktop_lyric_font_default": "默認", diff --git a/src/renderer-lyric/App.vue b/src/renderer-lyric/App.vue index e55e417d..c8eee7d4 100644 --- a/src/renderer-lyric/App.vue +++ b/src/renderer-lyric/App.vue @@ -33,6 +33,7 @@ export default { enable: false, isLock: true, isAlwaysOnTop: false, + isDelayScroll: true, width: 600, height: 700, x: -1, diff --git a/src/renderer-lyric/components/core/Lyric.vue b/src/renderer-lyric/components/core/Lyric.vue index 84b1f28d..7afdae25 100644 --- a/src/renderer-lyric/components/core/Lyric.vue +++ b/src/renderer-lyric/components/core/Lyric.vue @@ -22,6 +22,7 @@ export default { type: Object, default() { return { + isDelayScroll: true, style: { font: '', fontSize: 125, @@ -127,10 +128,14 @@ export default { if (n < 0) return if (n == 0 && this.isSetedLines) return this.isSetedLines = false if (o == null || n - o != 1) return this.handleScrollLrc() - delayScrollTimeout = setTimeout(() => { - delayScrollTimeout = null - this.handleScrollLrc(600) - }, 600) + if (this.lrcConfig.isDelayScroll) { + delayScrollTimeout = setTimeout(() => { + delayScrollTimeout = null + this.handleScrollLrc(600) + }, 600) + } else { + this.handleScrollLrc() + } }, immediate: true, }, diff --git a/src/renderer/views/setting/components/SettingDesktopLyric.vue b/src/renderer/views/setting/components/SettingDesktopLyric.vue index 9ca66a35..b8296385 100644 --- a/src/renderer/views/setting/components/SettingDesktopLyric.vue +++ b/src/renderer/views/setting/components/SettingDesktopLyric.vue @@ -5,6 +5,8 @@ dd base-checkbox(id="setting_desktop_lyric_enable" v-model="currentStting.desktopLyric.enable" :label="$t('setting__desktop_lyric_enable')") .gap-top base-checkbox(id="setting_desktop_lyric_lock" v-model="currentStting.desktopLyric.isLock" :label="$t('setting__desktop_lyric_lock')") + .gap-top + base-checkbox(id="setting_desktop_lyric_delayScroll" v-model="currentStting.desktopLyric.isDelayScroll" :label="$t('setting__desktop_lyric_delay_scroll')") .gap-top base-checkbox(id="setting_desktop_lyric_alwaysOnTop" v-model="currentStting.desktopLyric.isAlwaysOnTop" :label="$t('setting__desktop_lyric_always_on_top')") .gap-top diff --git a/src/renderer/views/setting/setting.js b/src/renderer/views/setting/setting.js index f252d78b..8b007922 100644 --- a/src/renderer/views/setting/setting.js +++ b/src/renderer/views/setting/setting.js @@ -17,6 +17,8 @@ export const currentStting = ref({ x: -1, y: -1, theme: '', + isLockScreen: true, + isDelayScroll: true, style: { font: '', fontSize: 125,