From 5097102ca1fa58ba6f7ebba13047a781cce9d778 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 5 Jun 2023 22:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDeepin=2020=E4=B8=8B=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=A1=8C=E9=9D=A2=E6=AD=8C=E8=AF=8D=E6=97=B6=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=A1=8C=E9=9D=A2=E5=8D=A1?= =?UTF-8?q?=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/main/modules/winLyric/main.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index fc986b62..0bf49f11 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -15,6 +15,7 @@ - 修复播放某些在线音频会没有声音的问题 - 修复改变播放速率时会导致歌词报错的问题 - 修复tx热门评论昵称被错误切割的问题 (#1397, By: @helloplhm-qwq, @Folltoshe) +- 修复Deepin 20下启用桌面歌词时可能会导致桌面卡死的问题(#1288) ### 其他 diff --git a/src/main/modules/winLyric/main.ts b/src/main/modules/winLyric/main.ts index 6c88e7ce..0beca7ef 100644 --- a/src/main/modules/winLyric/main.ts +++ b/src/main/modules/winLyric/main.ts @@ -1,6 +1,6 @@ import { join } from 'path' import { BrowserWindow } from 'electron' -import { debounce, isLinux } from '@common/utils' +import { debounce, isLinux, isWin } from '@common/utils' import { initWindowSize } from './utils' import { mainSend } from '@common/mainIpc' import { encodePath } from '@common/utils/electron' @@ -41,7 +41,7 @@ const winEvent = () => { 'desktopLyric.width': bounds.width, 'desktopLyric.height': bounds.height, }) - } else { + } else if (isWin) { // Linux 不允许将窗口设置出屏幕之外,MacOS未知,故只在Windows下执行强制设置 // 非主动调整窗口触发的窗口位置变化将重置回设置值 browserWindow!.setBounds({ x: global.lx.appSetting['desktopLyric.x'] ?? 0,