diff --git a/src/common/defaultSetting.ts b/src/common/defaultSetting.ts index e7ad3219..8a93be4d 100644 --- a/src/common/defaultSetting.ts +++ b/src/common/defaultSetting.ts @@ -62,7 +62,7 @@ const defaultSetting: LX.AppSetting = { 'desktopLyric.style.lineGap': 15, 'desktopLyric.style.lyricUnplayColor': 'rgba(255, 255, 255, 1)', 'desktopLyric.style.lyricPlayedColor': 'rgba(7, 197, 86, 1)', - 'desktopLyric.style.lyricShadowColor': 'rgba(0, 0, 0, 0.15)', + 'desktopLyric.style.lyricShadowColor': 'rgba(0, 0, 0, 0.18)', // 'desktopLyric.style.fontWeight': false, 'desktopLyric.style.opacity': 95, 'desktopLyric.style.ellipsis': false, diff --git a/src/renderer/utils/pickrTools.ts b/src/renderer/utils/pickrTools.ts index 321178f8..a0c9f516 100644 --- a/src/renderer/utils/pickrTools.ts +++ b/src/renderer/utils/pickrTools.ts @@ -4,7 +4,7 @@ import '@simonwep/pickr/dist/themes/classic.min.css' export interface PickrTools { pickr: Pickr | null - create: (dom: HTMLElement, color: string, swatches: string[] | null, change: (color: string) => void, reset: () => void) => PickrTools + create: (dom: HTMLElement, color: string, swatches: string[] | null, change: (color: string) => void, reset?: () => void) => PickrTools destroy: () => void setColor: (color: string) => void } @@ -72,10 +72,9 @@ export const pickrTools: PickrTools = { pickrTools.pickr.on('swatchselect', (color: any) => { swatchselectColor = color }).on('change', throttleChange).on('cancel', () => { - change(color) console.log('cancel') - }).on('cancel', () => { - reset() + change(color) + reset?.() }) return pickrTools diff --git a/src/renderer/views/Setting/components/SettingDesktopLyric.vue b/src/renderer/views/Setting/components/SettingDesktopLyric.vue index bf5d88d5..f2912c87 100644 --- a/src/renderer/views/Setting/components/SettingDesktopLyric.vue +++ b/src/renderer/views/Setting/components/SettingDesktopLyric.vue @@ -215,7 +215,7 @@ const useLyricColor = () => { const defaultSetting = { 'desktopLyric.style.lyricUnplayColor': 'rgba(255, 255, 255, 1)', 'desktopLyric.style.lyricPlayedColor': 'rgba(7, 197, 86, 1)', - 'desktopLyric.style.lyricShadowColor': 'rgba(0, 0, 0, 0.15)', + 'desktopLyric.style.lyricShadowColor': 'rgba(0, 0, 0, 0.18)', } updateSetting(defaultSetting) setLyricUnplayColor(defaultSetting['desktopLyric.style.lyricUnplayColor'])