From a1183a35d3f28c5f41e3646ae6e58a95534351a8 Mon Sep 17 00:00:00 2001
From: Kisechan <kisechan_@outlook.com>
Date: Tue, 26 Aug 2025 18:58:07 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=95=8C=E9=9D=A2=E7=9A=84=20bug=EF=BC=8C?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=A7=BB=E5=8A=A8=E5=92=8C=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=EF=BC=8C=E5=B9=B6=E5=B0=86=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9=E4=B8=BA=20`200px`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/main.js         |   9 ++-
 main/preload.js      |   3 +-
 renderer/src/App.vue | 127 +++++++++++++++++++++++++------------------
 3 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/main/main.js b/main/main.js
index 32dc9d9..bfc7078 100644
--- a/main/main.js
+++ b/main/main.js
@@ -73,8 +73,8 @@ let mainWindow;
 
 function createWindow() {
   mainWindow = new BrowserWindow({
-    width: 300,
-    height: 300,
+    width: 200,
+    height: 200,
     transparent: true, // 开启透明窗口
     frame: false,      // 无边框窗口
     resizable: false,  // 禁止调整大小
@@ -85,6 +85,11 @@ function createWindow() {
     },
   });
 
+  // 当渲染进程传来这个事件时，就移动窗口
+  ipcMain.on('move-window', (event, { x, y }) => {
+    mainWindow.setPosition(x, y, true); // true 表示动画平滑移动
+  });
+
   if (process.env.NODE_ENV === "development") {
     mainWindow.loadURL("http://localhost:5173");
   } else {
diff --git a/main/preload.js b/main/preload.js
index e078257..42a1d6e 100644
--- a/main/preload.js
+++ b/main/preload.js
@@ -13,5 +13,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
   showTooltip: (text) => ipcRenderer.send('show-tooltip', text),
   onUpdatePosition: (callback) => {
     ipcRenderer.on('update-position', (_, position) => callback(position))
-  }
+  },
+  moveWindow: (position) => ipcRenderer.send('move-window', position)
 })
\ No newline at end of file
diff --git a/renderer/src/App.vue b/renderer/src/App.vue
index 5fe61c1..f06b800 100644
--- a/renderer/src/App.vue
+++ b/renderer/src/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, reactive } from "vue";
 import petGif from "./assets/pet.gif";
 import { Howl } from "howler";
 
@@ -13,97 +13,123 @@ const isLoading = ref(true);  // 跟踪文件列表是否已加载
 onMounted(async () => {
   if (window.electronAPI && typeof window.electronAPI.getSoundFiles === 'function') {
     try {
-      const files = await window.electronAPI.getSoundFiles();
-      soundFiles.value = files;
-      console.log("成功加载声音文件:", files);
+      soundFiles.value = await window.electronAPI.getSoundFiles();
     } catch (error) {
       console.error("获取声音文件列表失败:", error);
     } finally {
       isLoading.value = false;
     }
-  } else {
-    console.error("electronAPI.getSoundFiles 函数不存在。");
-    isLoading.value = false;
   }
 });
 
-
-// 点击事件处理
-const handleClick = async () => {
-  // 如果正在加载或没有声音文件，则不执行任何操作
-  if (isLoading.value || soundFiles.value.length === 0) {
-    console.warn("声音文件尚未加载或列表为空。");
-    return;
-  }
-
-  // 从文件列表中随机选择一个文件
-  const randomSoundFile =
-    soundFiles.value[Math.floor(Math.random() * soundFiles.value.length)];
-  console.log("请求播放:", randomSoundFile);
-
+const playRandomSound = async () => {
+  if (isLoading.value || soundFiles.value.length === 0) return;
+  const randomSoundFile = soundFiles.value[Math.floor(Math.random() * soundFiles.value.length)];
   try {
-    const audioUrl = await window.electronAPI?.getSoundPath(randomSoundFile);
-
-    if (audioUrl) {
-      const sound = new Howl({
-        src: [audioUrl],
-        format: ["mp3"],
-      });
-      sound.play();
-    } else {
-      console.error("无法获取音频路径:", randomSoundFile);
-    }
+    const audioUrl = await window.electronAPI.getSoundPath(randomSoundFile);
+    if (audioUrl) new Howl({ src: [audioUrl], format: ["mp3"] }).play();
   } catch (err) {
     console.error("播放失败:", err);
   }
-
-  // 将提示文案设置为文件名
   currentTooltip.value = randomSoundFile.replace(/\.mp3$/, '');
   showTooltip.value = true;
   setTimeout(() => (showTooltip.value = false), 2000);
 };
+
+// 新的拖拽与点击处理逻辑
+const dragState = reactive({
+  isDragging: false,    // 是否正在拖动
+  hasMoved: false,      // 本次拖动是否真的移动了
+  startX: 0,            // 鼠标按下的起始 X 坐标
+  startY: 0,            // 鼠标按下的起始 Y 坐标
+});
+
+// 鼠标按下事件
+function handleMouseDown(event) {
+  dragState.isDragging = true;
+  dragState.hasMoved = false; // 重置移动状态
+  dragState.startX = event.screenX;
+  dragState.startY = event.screenY;
+  
+  // 添加全局监听器
+  window.addEventListener('mousemove', handleMouseMove);
+  window.addEventListener('mouseup', handleMouseUp);
+}
+
+// 鼠标移动事件
+function handleMouseMove(event) {
+  if (!dragState.isDragging) return;
+
+  const deltaX = event.screenX - dragState.startX;
+  const deltaY = event.screenY - dragState.startY;
+
+  // 如果移动超过一个小阈值（例如5像素），我们才认为这是一次“拖动”
+  if (Math.abs(deltaX) > 5 || Math.abs(deltaY) > 5) {
+    dragState.hasMoved = true;
+  }
+  
+  // 实时通知主进程移动窗口
+  window.electronAPI.moveWindow({ x: event.screenX, y: event.screenY });
+}
+
+// 鼠标抬起事件
+function handleMouseUp() {
+  // 如果鼠标按下后没有真正移动过，就认为这是一次点击
+  if (dragState.isDragging && !dragState.hasMoved) {
+    playRandomSound();
+  }
+
+  // 状态重置
+  dragState.isDragging = false;
+  
+  // 移除全局监听器(非常重要)
+  window.removeEventListener('mousemove', handleMouseMove);
+  window.removeEventListener('mouseup', handleMouseUp);
+}
 </script>
 
 <template>
-  <div class="pet-container">
+  <div class="pet-container" @mousedown="handleMouseDown">
     <transition name="fade">
       <div v-if="showTooltip" class="tooltip">
         {{ currentTooltip }}
       </div>
     </transition>
-    <img :src="petGif" class="pet-gif" @click="handleClick" />
+    <img :src="petGif" class="pet-gif" />
   </div>
 </template>
 
 <style>
+/* 全局样式保持不变 */
 html, body, #app {
   background-color: transparent !important;
   margin: 0;
   padding: 0;
-  overflow: hidden; /* 隐藏滚动条 */
+  overflow: hidden;
 }
 </style>
 
 <style scoped>
+/* 样式大大简化 */
 .pet-container {
-  width: 300px;
-  height: 300px;
-  /* 将整个容器设置为可拖拽区域 */
-  -webkit-app-region: drag;
+  width: 200px;
+  height: 200px;
+  position: relative;
+  cursor: pointer;
+  user-select: none; /* 防止拖动时选中文本 */
 }
 
 .pet-gif {
   width: 100%;
   height: 100%;
-  cursor: pointer;
-  user-select: none;
-  /* 设置图片为不可拖拽，以便响应点击事件 */
-  -webkit-app-region: no-drag;
+  display: block;
+  /* 图片现在不接收任何鼠标事件，所有事件都由父容器处理 */
+  pointer-events: none; 
 }
 
 .tooltip {
   position: absolute;
-  bottom: -40px;
+  bottom: 10px;
   left: 50%;
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.7);
@@ -112,16 +138,13 @@ html, body, #app {
   border-radius: 20px;
   font-size: 14px;
   white-space: nowrap;
-  /* 确保提示框不会干扰拖拽 */
-  -webkit-app-region: no-drag;
+  pointer-events: none; /* 提示框也不响应鼠标 */
 }
 
-.fade-enter-active,
-.fade-leave-active {
+.fade-enter-active, .fade-leave-active {
   transition: opacity 0.3s;
 }
-.fade-enter-from,
-.fade-leave-to {
+.fade-enter-from, .fade-leave-to {
   opacity: 0;
 }
 </style>
\ No newline at end of file