修复windows下界面缩放后移动桌面歌词会改变歌词窗口大小的问题（#2244）

publish/changeLog.md

@@ -1,4 +1,5 @@
 ### 修复
 
 - 修复 Windows 下桌面歌词最小高度设置问题（#2244）
+- 修复 Windows 下界面缩放后移动桌面歌词会改变歌词窗口大小的问题（#2244）
 - 修复 tx 歌单搜索名字、描述出现乱码的问题（#2250）

src/main/modules/winLyric/utils.ts

@@ -14,11 +14,9 @@ export let minHeight = 38
  * @param param 新设置（相对于当前设置）
  * @returns
  */
-export const getLyricWindowBounds = (bounds: Electron.Rectangle, { x = 0, y = 0, w, h }: LX.DesktopLyric.NewBounds): Electron.Rectangle => {
+export const getLyricWindowBounds = (bounds: Electron.Rectangle, { x, y, w, h }: LX.DesktopLyric.NewBounds): Electron.Rectangle => {
-  if (w == 0) w = bounds.width
+  if (w < minWidth) w = minWidth
-  else if (w < minWidth) w = minWidth
+  if (h < minHeight) h = minHeight
-  if (h == 0) h = bounds.height
-  else if (h < minHeight) h = minHeight
 
   if (global.lx.appSetting['desktopLyric.isLockScreen']) {
     if (!global.envParams.workAreaSize) return bounds

src/renderer-lyric/components/layout/LyricHorizontal/useLyric.js

@@ -22,6 +22,8 @@ export default (isComputeHeight) => {
     isMsDown: false,
     msDownX: 0,
     msDownY: 0,
+    windowW: 0,
+    windowH: 0,
   }
 
   let msDownY = 0
@@ -83,6 +85,8 @@ export default (isComputeHeight) => {
       winEvent.isMsDown = true
       winEvent.msDownX = x
       winEvent.msDownY = y
+      winEvent.windowW = window.innerWidth
+      winEvent.windowH = window.innerHeight
     }
   }
   const handleLyricMouseDown = event => {
@@ -114,8 +118,8 @@ export default (isComputeHeight) => {
         setWindowBounds({
           x: x - winEvent.msDownX,
           y: y - winEvent.msDownY,
-          w: 0,
+          w: winEvent.windowW,
-          h: 0,
+          h: winEvent.windowH,
         })
       } else {
         setWindowBounds({

src/renderer-lyric/components/layout/LyricVertical/useLyric.js

@@ -3,6 +3,7 @@ import { scrollXRTo } from '@common/utils/renderer'
 import { lyric } from '@lyric/store/lyric'
 import { isPlay, setting } from '@lyric/store/state'
 import { setWindowBounds } from '@lyric/utils/ipc'
+import { isWin } from '@common/utils'
 
 const getOffsetTop = (contentWidth, lineWidth) => {
   switch (setting['desktopLyric.scrollAlign']) {
@@ -21,6 +22,8 @@ export default (isComputeWidth) => {
     isMsDown: false,
     msDownX: 0,
     msDownY: 0,
+    windowW: 0,
+    windowH: 0,
   }
 
   let msDownX = 0
@@ -82,6 +85,8 @@ export default (isComputeWidth) => {
       winEvent.isMsDown = true
       winEvent.msDownX = x
       winEvent.msDownY = y
+      winEvent.windowW = window.innerWidth
+      winEvent.windowH = window.innerHeight
     }
   }
   const handleLyricMouseDown = event => {
@@ -108,6 +113,15 @@ export default (isComputeWidth) => {
       dom_lyric.value.scrollLeft = msDownScrollX + msDownX - x
       startLyricScrollTimeout()
     } else if (winEvent.isMsDown) {
+      // https://github.com/lyswhut/lx-music-desktop/issues/2244
+      if (isWin) {
+        setWindowBounds({
+          x: x - winEvent.msDownX,
+          y: y - winEvent.msDownY,
+          w: winEvent.windowW,
+          h: winEvent.windowH,
+        })
+      } else {
         setWindowBounds({
           x: x - winEvent.msDownX,
           y: y - winEvent.msDownY,
@@ -116,6 +130,7 @@ export default (isComputeWidth) => {
         })
       }
     }
+  }
   const handleMouseMsMove = event => {
     handleMove(event.clientX, event.clientY)
   }