From fe259747dce06cfeee9a58657c58da7cda092727 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 5 Mar 2023 14:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=87=8F=E3=80=81=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=AD=89=E8=AE=BE=E7=BD=AE=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E5=BC=8F=E6=8C=89=E9=92=AE=E5=9C=A8=E9=BC=A0=E6=A0=87=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E6=8C=89=E9=92=AE=E4=B8=8A=E6=97=B6=E5=B0=86=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=B9=E5=87=BA=E8=AE=BE=E7=BD=AE=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                          |  1 +
 .../layout/PlayBar/PlayProgress.vue           |  7 ++--
 src/renderer/components/material/PopupBtn.vue | 40 +++++++++++++++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index a46de0fb..4ed95ef7 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -11,6 +11,7 @@
 
 - 支持wy源flac hires歌曲类型的显示
 - 快捷键调整音量时每次加减2%音量改为4%（#1220）
+- 音量、播放模式等设置弹出式按钮在鼠标移到按钮上时将自动弹出设置内容，保留点击切换显示/隐藏
 
 ### 修复
 
diff --git a/src/renderer/components/layout/PlayBar/PlayProgress.vue b/src/renderer/components/layout/PlayBar/PlayProgress.vue
index 9633bab9..6733478a 100644
--- a/src/renderer/components/layout/PlayBar/PlayProgress.vue
+++ b/src/renderer/components/layout/PlayBar/PlayProgress.vue
@@ -28,9 +28,10 @@ export default {
     const dom_btn = ref<HTMLElement | null>(null)
 
     const handleShowPopup = (evt) => {
-      if (visible.value) evt.stopPropagation()
-      if (visible.value) handlMsLeave()
-      else handlMsEnter()
+      if (visible.value) {
+        evt.stopPropagation()
+        handlMsLeave()
+      } else handlMsEnter()
     }
     const {
       nowPlayTimeStr,
diff --git a/src/renderer/components/material/PopupBtn.vue b/src/renderer/components/material/PopupBtn.vue
index 53028762..61687002 100644
--- a/src/renderer/components/material/PopupBtn.vue
+++ b/src/renderer/components/material/PopupBtn.vue
@@ -1,7 +1,7 @@
 <template>
-  <div ref="dom_btn" :class="$style.content" @click="handleShowPopup">
+  <div ref="dom_btn" :class="$style.content" @click="handleShowPopup" @mouseenter="handlMsEnter" @mouseleave="handlMsLeave">
     <slot />
-    <base-popup v-model:visible="visible" :btn-el="dom_btn">
+    <base-popup v-model:visible="visible" :btn-el="dom_btn" @mouseenter="handlMsEnter" @mouseleave="handlMsLeave">
       <slot name="content" />
     </base-popup>
   </div>
@@ -14,11 +14,37 @@ const visible = ref(false)
 const dom_btn = ref<HTMLElement | null>(null)
 
 const handleShowPopup = (evt: MouseEvent) => {
-  if (visible.value) evt.stopPropagation()
-  setTimeout(() => {
-    // if (!)
-    visible.value = !visible.value
-  }, 50)
+  if (visible.value) {
+    evt.stopPropagation()
+    handlMsLeave()
+  } else handlMsEnter()
+  // setTimeout(() => {
+  //   // if (!)
+  //   visible.value = !visible.value
+  // }, 50)
+}
+
+let timeout: number | null = null
+const handlMsEnter = () => {
+  if (timeout) {
+    clearTimeout(timeout)
+    timeout = null
+  }
+  if (visible.value) return
+  timeout = setTimeout(() => {
+    visible.value = true
+  }, 100) as unknown as number
+}
+const handlMsLeave = () => {
+  if (timeout) {
+    clearTimeout(timeout)
+    timeout = null
+  }
+  if (!visible.value) return
+  timeout = setTimeout(() => {
+    timeout = null
+    visible.value = false
+  }, 100) as unknown as number
 }
 
 defineExpose({