fix #731 #887,修复桌面歌词与主窗口阴影残留 (#1869)

* fix #731

* fix #887

* Revert "在歌词滚动结束后清理窗口阴影,缓解Mac下桌面歌词出现残留阴影的问题"

This reverts commit 1f6a6bbb39.

* update

* fix

---------

Co-authored-by: lyswhut <lyswhut@qq.com>
This commit is contained in:
zclorne
2024-04-28 18:53:04 +08:00
committed by GitHub
co-authored by lyswhut
parent 49797f891c
commit 05363a0d22
9 changed files with 11 additions and 33 deletions
+1 -5
View File
@@ -119,6 +119,7 @@ export const createWindow = () => {
useContentSize: true,
frame: false,
transparent: true,
hasShadow: false,
// enableRemoteModule: false,
// icon: join(global.__static, isWin ? 'icons/256x256.ico' : 'icons/512x512.png'),
resizable: false,
@@ -194,11 +195,6 @@ export const getMainFrame = (): Electron.WebFrameMain | null => {
return browserWindow.webContents.mainFrame
}
export const invalidateShadow = () => {
if (!browserWindow) return
browserWindow.invalidateShadow()
}
interface AlwaysOnTopTools {
timeout: NodeJS.Timeout | null
setAlwaysOnTop: (isLoop: boolean) => void
+1 -5
View File
@@ -3,7 +3,7 @@ import { mainOn, mainHandle } from '@common/mainIpc'
import { WIN_LYRIC_RENDERER_EVENT_NAME } from '@common/ipcNames'
import { buildLyricConfig, getLyricWindowBounds } from './utils'
import { sendNewDesktopLyricClient } from '@main/modules/winMain'
import { getBounds, getMainFrame, invalidateShadow, sendEvent, setBounds } from './main'
import { getBounds, getMainFrame, sendEvent, setBounds } from './main'
import { MessageChannelMain } from 'electron'
@@ -29,10 +29,6 @@ export default () => {
setBounds(getLyricWindowBounds(getBounds(), options))
})
mainOn(WIN_LYRIC_RENDERER_EVENT_NAME.invalidate_shadow, () => {
invalidateShadow()
})
mainOn(WIN_LYRIC_RENDERER_EVENT_NAME.request_main_window_channel, ({ event }) => {
if (event.senderFrame !== getMainFrame()) return
// Create a new channel ...