From 9cebaa0d97f80f9057916c9a7eb7f971cd726c18 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 25 Jun 2020 19:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AD=8C=E8=AF=8D=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E8=A7=A6=E6=91=B8=E6=9D=BF=E3=80=81=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=BB=9A=E8=BD=AE=E7=AD=89=E5=AF=B9=E6=AD=8C=E8=AF=8D=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer-lyric/components/core/Lyric.vue  | 12 +++++++++++-
 src/renderer/components/core/PlayerDetail.vue | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/renderer-lyric/components/core/Lyric.vue b/src/renderer-lyric/components/core/Lyric.vue
index fb369524..8d70bca4 100644
--- a/src/renderer-lyric/components/core/Lyric.vue
+++ b/src/renderer-lyric/components/core/Lyric.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-div(:class="[$style.lyric, lyricEvent.isMsDown ? $style.draging : null]" :style="lrcStyles" @mousedown="handleLyricMouseDown" ref="dom_lyric")
+div(:class="[$style.lyric, lyricEvent.isMsDown ? $style.draging : null]" :style="lrcStyles" @wheel="handleWheel" @mousedown="handleLyricMouseDown" ref="dom_lyric")
   div(:class="$style.lyricSpace")
   div(v-for="(info, index) in lyricLines" :key="index" :class="[$style.lineContent, lyric.line == index ? (lrcConfig.style.isZoomActiveLrc ? $style.lrcActiveZoom : $style.lrcActive) : null]")
     p(:class="$style.lrcLine") {{info.text}}
@@ -238,6 +238,16 @@ export default {
         this.handleScrollLrc()
       }, 3000)
     },
+    handleWheel(event) {
+      // console.log(event.deltaY)
+      if (!this.lyricEvent.isStopScroll) this.lyricEvent.isStopScroll = true
+      if (cancelScrollFn) {
+        cancelScrollFn()
+        cancelScrollFn = null
+      }
+      this.$refs.dom_lyric.scrollTop = this.$refs.dom_lyric.scrollTop + event.deltaY
+      this.startLyricScrollTimeout()
+    },
     clearLyricScrollTimeout() {
       if (!this.lyricEvent.timeout) return
       clearTimeout(this.lyricEvent.timeout)
diff --git a/src/renderer/components/core/PlayerDetail.vue b/src/renderer/components/core/PlayerDetail.vue
index 8e1ed025..bfcaa513 100644
--- a/src/renderer/components/core/PlayerDetail.vue
+++ b/src/renderer/components/core/PlayerDetail.vue
@@ -29,7 +29,7 @@
           ul
 
       div(:class="$style.right")
-        div(:class="[$style.lyric, lyricEvent.isMsDown ? $style.draging : null]" @mousedown="handleLyricMouseDown" ref="dom_lyric")
+        div(:class="[$style.lyric, lyricEvent.isMsDown ? $style.draging : null]" @wheel="handleWheel" @mousedown="handleLyricMouseDown" ref="dom_lyric")
           div(:class="$style.lyricSpace")
           p(v-for="(info, index) in lyricLines" :key="index" :class="lyric.line == index ? $style.lrcActive : null") {{info.text}}
           div(:class="$style.lyricSpace")
@@ -301,6 +301,16 @@ export default {
         this.handleScrollLrc()
       }, 3000)
     },
+    handleWheel(event) {
+      console.log(event.deltaY)
+      if (!this.lyricEvent.isStopScroll) this.lyricEvent.isStopScroll = true
+      if (cancelScrollFn) {
+        cancelScrollFn()
+        cancelScrollFn = null
+      }
+      this.$refs.dom_lyric.scrollTop = this.$refs.dom_lyric.scrollTop + event.deltaY
+      this.startLyricScrollTimeout()
+    },
     clearLyricScrollTimeout() {
       if (!this.lyricEvent.timeout) return
       clearTimeout(this.lyricEvent.timeout)