修复若桌面歌词窗口与主窗口重叠时,鼠标划过重叠区域鼠标会闪烁的问题
parent
da8e67d4e5
commit
cf9d98d434
|
@ -1,3 +1,4 @@
|
||||||
### 修复
|
### 修复
|
||||||
|
|
||||||
- 修复处于不支持的源时,歌单、排行榜的右键下载菜单没有禁用的问题
|
- 修复处于不支持的源时,歌单、排行榜的右键下载菜单没有禁用的问题
|
||||||
|
- 修复若桌面歌词窗口与主窗口重叠时,鼠标划过重叠区域鼠标会闪烁的问题,注:此修复只对未启用“鼠标移入歌词区域时降低歌词透明度”时有效
|
||||||
|
|
|
@ -9,6 +9,7 @@ let isEnable = null
|
||||||
let isAlwaysOnTop = null
|
let isAlwaysOnTop = null
|
||||||
let isAlwaysOnTopLoop = null
|
let isAlwaysOnTopLoop = null
|
||||||
let isLockScreen = null
|
let isLockScreen = null
|
||||||
|
let isHoverHide = null
|
||||||
|
|
||||||
const alwaysOnTopTools = {
|
const alwaysOnTopTools = {
|
||||||
timeout: null,
|
timeout: null,
|
||||||
|
@ -48,9 +49,15 @@ const setLrcConfig = () => {
|
||||||
if (isLock != desktopLyric.isLock) {
|
if (isLock != desktopLyric.isLock) {
|
||||||
isLock = desktopLyric.isLock
|
isLock = desktopLyric.isLock
|
||||||
if (desktopLyric.isLock) {
|
if (desktopLyric.isLock) {
|
||||||
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux })
|
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux && global.appSetting.desktopLyric.isHoverHide })
|
||||||
} else {
|
} else {
|
||||||
global.modules.lyricWindow.setIgnoreMouseEvents(false, { forward: !isLinux })
|
global.modules.lyricWindow.setIgnoreMouseEvents(false, { forward: !isLinux && global.appSetting.desktopLyric.isHoverHide })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isHoverHide != desktopLyric.isHoverHide) {
|
||||||
|
isHoverHide = desktopLyric.isHoverHide
|
||||||
|
if (!isLinux) {
|
||||||
|
global.modules.lyricWindow.setIgnoreMouseEvents(desktopLyric.isLock, { forward: global.appSetting.desktopLyric.isHoverHide })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isAlwaysOnTop != desktopLyric.isAlwaysOnTop) {
|
if (isAlwaysOnTop != desktopLyric.isAlwaysOnTop) {
|
||||||
|
|
|
@ -64,7 +64,7 @@ const winEvent = lyricWindow => {
|
||||||
lyricWindow.once('ready-to-show', () => {
|
lyricWindow.once('ready-to-show', () => {
|
||||||
lyricWindow.show()
|
lyricWindow.show()
|
||||||
if (global.appSetting.desktopLyric.isLock) {
|
if (global.appSetting.desktopLyric.isLock) {
|
||||||
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux })
|
global.modules.lyricWindow.setIgnoreMouseEvents(true, { forward: !isLinux && global.appSetting.desktopLyric.isHoverHide })
|
||||||
}
|
}
|
||||||
// linux下每次重开时貌似要重新设置置顶
|
// linux下每次重开时貌似要重新设置置顶
|
||||||
if (isLinux && global.appSetting.desktopLyric.isAlwaysOnTop) {
|
if (isLinux && global.appSetting.desktopLyric.isAlwaysOnTop) {
|
||||||
|
|
Loading…
Reference in New Issue