🐞 fix: 尝试修复缩放问题

Author: imsyy

electron/main/ipc/ipc-lyric.ts

@@ -144,6 +144,20 @@ const initLyricIpc = (): void => {
     store.set("lyric", { ...store.get("lyric"), height });
   });
 
+  // 是否固定当前最大宽高
+  ipcMain.on(
+    "toggle-fixed-max-size",
+    (_, options: { width: number; height: number; fixed: boolean }) => {
+      if (!isWinAlive(lyricWin)) return;
+      const { width, height, fixed } = options;
+      if (fixed) {
+        lyricWin.setMaximumSize(width, height);
+      } else {
+        lyricWin.setMaximumSize(1400, 360);
+      }
+    },
+  );
+
   // 请求歌词数据及配置
   ipcMain.on("request-desktop-lyric-data", () => {
     if (!isWinAlive(lyricWin)) return;

electron/main/windows/lyric-window.ts

@@ -42,9 +42,9 @@ class LyricWindow {
     this.win = createWindow({
       width: width || 800,
       height: height || 180,
-      minWidth: 440,
+      minWidth: 640,
       minHeight: 140,
-      maxWidth: 1600,
+      maxWidth: 1400,
       maxHeight: 360,
       // 没有指定位置时居中显示
       center: !(x && y),

src/views/DesktopLyric/index.vue

@@ -164,13 +164,20 @@ const dragState = reactive({
 const lyricDragStart = async (_position: Position, event: PointerEvent) => {
   if (lyricConfig.isLock) return;
   dragState.isDragging = true;
-  const { x, y, width, height } = await window.electron.ipcRenderer.invoke("get-window-bounds");
+  const { x, y } = await window.electron.ipcRenderer.invoke("get-window-bounds");
+  const { width, height } = await window.api.store.get("lyric");
+  // 直接限制最大宽高
+  window.electron.ipcRenderer.send("toggle-fixed-max-size", {
+    width,
+    height,
+    fixed: true,
+  });
   dragState.startX = event?.screenX ?? 0;
   dragState.startY = event?.screenY ?? 0;
   dragState.startWinX = x;
   dragState.startWinY = y;
-  dragState.winWidth = width;
-  dragState.winHeight = height;
+  dragState.winWidth = width ?? 0;
+  dragState.winHeight = height ?? 0;
 };
 
 /**
@@ -209,17 +216,26 @@ useDraggable(desktopLyricRef, {
   onMove: (position, event) => {
     lyricDragMove(position, event);
   },
-  onEnd: async () => {
-    const { width, height } = await window.electron.ipcRenderer.invoke("get-window-bounds");
-    // 若不等于初始宽高
-    if (width !== dragState.winWidth || height !== dragState.winHeight) {
+  onEnd: () => {
+    // 关闭拖拽状态
+    dragState.isDragging = false;
+    requestAnimationFrame(() => {
+      // 恢复拖拽前宽高
       window.electron.ipcRenderer.send(
         "update-lyric-size",
         dragState.winWidth,
         dragState.winHeight,
       );
-    }
-    dragState.isDragging = false;
+      // 根据字体大小恢复一次高度
+      const height = fontSizeToHeight(lyricConfig.fontSize);
+      if (height) pushWindowHeight(height);
+      // 恢复最大宽高
+      window.electron.ipcRenderer.send("toggle-fixed-max-size", {
+        width: dragState.winWidth,
+        height: dragState.winHeight,
+        fixed: false,
+      });
+    });
   },
 });
 
@@ -247,6 +263,7 @@ watch(
   computedFontSize,
   (size) => {
     if (!Number.isFinite(size)) return;
+    if (dragState.isDragging) return;
     if (size === lyricConfig.fontSize) return;
     const next = { fontSize: size };
     window.electron.ipcRenderer.send("update-desktop-lyric-option", next, true);
@@ -272,6 +289,7 @@ const fontSizeToHeight = (size: number) => {
 // 防抖推送窗口高度更新，避免频繁抖动
 const pushWindowHeight = useDebounceFn((nextHeight: number) => {
   if (!Number.isFinite(nextHeight)) return;
+  if (dragState.isDragging) return;
   window.electron.ipcRenderer.send("update-window-height", nextHeight);
 }, 100);
 
@@ -302,6 +320,9 @@ onMounted(() => {
   });
   window.electron.ipcRenderer.on("update-desktop-lyric-option", (_event, config: LyricConfig) => {
     Object.assign(lyricConfig, config);
+    // 根据文字大小改变一次高度
+    const height = fontSizeToHeight(config.fontSize);
+    if (height) pushWindowHeight(height);
   });
   // 请求歌词数据及配置
   window.electron.ipcRenderer.send("request-desktop-lyric-data");