diff --git a/publish/changeLog.md b/publish/changeLog.md index a3fec304..e03cd679 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,7 +1,7 @@ ### 新增 - 新增对播放详情页歌词大小、是否缩放、对齐方式的设置,可以去设置-播放详情页设置查看 -- 新增通过播放详情页歌词调整播放进度 +- 新增播放详情页通过歌词调整播放进度,默认关闭,需要到设置-播放详情页设置开启,开启后在播放详情页拖动歌词时将会出现跳转当前行歌词播放的按钮 ### 优化 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index cb4dbb0a..400c231e 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.52', + version: '1.0.53', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -21,6 +21,7 @@ const defaultSetting = { }, playDetail: { isZoomActiveLrc: true, + isShowLyricProgressSetting: false, style: { fontSize: 100, align: 'center', diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 7e8e0c1b..814e6919 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -328,6 +328,7 @@ "setting__play_detail_align_center": "Centered", "setting__play_detail_align_left": "Left", "setting__play_detail_align_right": "Right", + "setting__play_detail_detail_lyric_progress": "Allows to adjust playback progress by lyrics", "setting__play_detail_font_size": "Lyrics font size (you can use the keyboard + - adjust the font size on the playback details page)", "setting__play_detail_font_size_current": "Current font size: {size}", "setting__play_detail_font_size_reset": "Reset", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 48b99f65..e438e4af 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -328,6 +328,7 @@ "setting__play_detail_align_center": "居中", "setting__play_detail_align_left": "居左", "setting__play_detail_align_right": "居右", + "setting__play_detail_detail_lyric_progress": "允许通过歌词调整播放进度", "setting__play_detail_font_size": "歌词字体大小(可以在播放详情页使用键盘的 + - 调整字体大小)", "setting__play_detail_font_size_current": "当前字体大小:{size}", "setting__play_detail_font_size_reset": "重置", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 1a3ca95d..851ef3e1 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -328,6 +328,7 @@ "setting__play_detail_align_center": "居中", "setting__play_detail_align_left": "居左", "setting__play_detail_align_right": "居右", + "setting__play_detail_detail_lyric_progress": "允許通過歌詞調整播放進度", "setting__play_detail_font_size": "歌詞字體大小(可以在播放詳情頁使用鍵盤的 + - 調整字體大小)", "setting__play_detail_font_size_current": "當前字體大小:{size}", "setting__play_detail_font_size_reset": "重置", diff --git a/src/renderer/components/core/PlayDetail/LyricPlayer.vue b/src/renderer/components/core/PlayDetail/LyricPlayer.vue index 303c7ed1..c773ffae 100644 --- a/src/renderer/components/core/PlayDetail/LyricPlayer.vue +++ b/src/renderer/components/core/PlayDetail/LyricPlayer.vue @@ -6,7 +6,7 @@
-
+
{{timeStr}} @@ -73,6 +73,7 @@ export default { } }) const isZoomActiveLrc = computed(() => setting.value.playDetail.isZoomActiveLrc) + const isShowLyricProgressSetting = computed(() => setting.value.playDetail.isShowLyricProgressSetting) onMounted(() => { window.eventHub.on('key_shift++_down', fontSizeUp) @@ -99,9 +100,10 @@ export default { handleSkipMouseEnter, handleSkipMouseLeave, lyric, - isShowLrcSelectContent, lrcStyles, lrcFontSize, + isShowLrcSelectContent, + isShowLyricProgressSetting, isZoomActiveLrc, isStopScroll, } diff --git a/src/renderer/utils/compositions/useLyric.js b/src/renderer/utils/compositions/useLyric.js index 8054e1ba..7ed45d5e 100644 --- a/src/renderer/utils/compositions/useLyric.js +++ b/src/renderer/utils/compositions/useLyric.js @@ -42,6 +42,7 @@ export default ({ isPlay, lyric }) => { const setTime = throttle(() => { if (point.x == null) { + if (!dom_skip_line.value) return const rect = dom_skip_line.value.getBoundingClientRect() point.x = rect.x point.y = rect.y diff --git a/src/renderer/views/setting/components/SettingPlayDetail.vue b/src/renderer/views/setting/components/SettingPlayDetail.vue index c01ca80e..44ad73ba 100644 --- a/src/renderer/views/setting/components/SettingPlayDetail.vue +++ b/src/renderer/views/setting/components/SettingPlayDetail.vue @@ -3,6 +3,8 @@ dt#play_detail {{$t('setting__play_detail')}} dd .gap-top base-checkbox(id="setting_play_detail_font_zoom_enable" v-model="currentStting.playDetail.isZoomActiveLrc" :label="$t('setting__play_detail_font_zoom')") + .gap-top + base-checkbox(id="setting_play_detail_lyric_progress_enable" v-model="currentStting.playDetail.isShowLyricProgressSetting" :label="$t('setting__play_detail_detail_lyric_progress')") dd h3#play_detail_align {{$t('setting__play_detail_align')}}