屏蔽设置

pull/930/merge
lyswhut 2022-06-18 11:50:54 +08:00
parent f33947287c
commit a31180260b
4 changed files with 8 additions and 5 deletions

View File

@ -1,7 +1,7 @@
### 新增
- 新增设置-以全屏模式启动设置
- 新增设置-桌面歌词设置-鼠标移入歌词区域时降低歌词透明度(#883默认关闭此功能存在平台兼容性问题,若鼠标移出后无法恢复到正常透明度,可尝试再移入移出即可恢复
- 新增设置-桌面歌词设置-鼠标移入歌词区域时降低歌词透明度(#883默认关闭此设置不支持linux注:此功能存在兼容性问题,若鼠标移出后无法恢复到正常透明度,可尝试再移入移出即可恢复
### 优化

View File

@ -2,6 +2,7 @@ const { common: COMMON_EVENT_NAME, winLyric: WIN_LYRIC_EVENT_NAME, hotKey: HOT_K
const { mainSend, NAMES: { winLyric: ipcWinLyricNames } } = require('../../../common/ipc')
const { desktop_lyric } = require('../../../common/hotKey')
const { getLyricWindowBounds } = require('./utils')
const { isLinux } = require('@common/utils')
let isLock = null
let isEnable = null
@ -47,9 +48,9 @@ const setLrcConfig = () => {
if (isLock != desktopLyric.isLock) {
isLock = desktopLyric.isLock
if (desktopLyric.isLock) {
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: true })
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux })
} else {
global.modules.lyricWindow.setIgnoreMouseEvents(false, { forward: true })
global.modules.lyricWindow.setIgnoreMouseEvents(false, { forward: !isLinux })
}
}
if (isAlwaysOnTop != desktopLyric.isAlwaysOnTop) {

View File

@ -64,7 +64,7 @@ const winEvent = lyricWindow => {
lyricWindow.once('ready-to-show', () => {
lyricWindow.show()
if (global.appSetting.desktopLyric.isLock) {
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: true })
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux })
}
// linux下每次重开时貌似要重新设置置顶
if (isLinux && global.appSetting.desktopLyric.isAlwaysOnTop) {

View File

@ -13,7 +13,7 @@ dd
base-checkbox(id="setting_desktop_lyric_alwaysOnTopLoop" v-model="currentStting.desktopLyric.isAlwaysOnTopLoop" :label="$t('setting__desktop_lyric_always_on_top_loop')")
.gap-top
base-checkbox(id="setting_desktop_lyric_lockScreen" v-model="currentStting.desktopLyric.isLockScreen" :label="$t('setting__desktop_lyric_lock_screen')")
.gap-top
.gap-top(v-if="!isLinux")
base-checkbox(id="setting_desktop_lyric_hoverHide" v-model="currentStting.desktopLyric.isHoverHide" :label="$t('setting__desktop_lyric_hover_hide')")
dd
h3#desktop_lyric_font {{$t('setting__desktop_lyric_font')}}
@ -25,6 +25,7 @@ dd
import { ref, computed, useI18n } from '@renderer/utils/vueTools'
import { getSystemFonts } from '@renderer/utils/tools'
import { currentStting } from '../setting'
import { isLinux } from '@common/utils'
export default {
name: 'SettingDesktopLyric',
@ -41,6 +42,7 @@ export default {
return {
currentStting,
fontList,
isLinux,
}
},
}