okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some lyrics

Browse source
This commit is contained in:
vapormusic 2021-12-20 22:31:28 +07:00
parent 2db84c72a9
commit 7337651376
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/style.less
View file

@ -2027,7 +2027,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
flex: 0 0 auto; flex: 0 0 auto;
flex-direction: row; flex-direction: row;
font-size: 14px; font-size: 14px;
justify-content: center; justify-content: center-between;
align-items: center; align-items: center;
border-bottom: 1px solid rgb(200 200 200 / 10%); border-bottom: 1px solid rgb(200 200 200 / 10%);

13
src/renderer/views/components/lyrics-view.ejs
View file

@ -45,7 +45,7 @@
props: ["time", "lyrics", "richlyrics", "translation", "onindex"], props: ["time", "lyrics", "richlyrics", "translation", "onindex"],
watch: { watch: {
time: function () { time: function () {
if (app.lyricon && app.drawer.open) { if (app.lyricon && app.drawer.open && this.$refs.lyricsview) {
let currentLine = this.$refs.lyricsview.querySelector(`.lyric-line.active`) let currentLine = this.$refs.lyricsview.querySelector(`.lyric-line.active`)
if (currentLine && currentLine.getElementsByClassName('lyricWaiting').length > 0) { if (currentLine && currentLine.getElementsByClassName('lyricWaiting').length > 0) {
let duration = currentLine.getAttribute("end") - currentLine.getAttribute("start"); let duration = currentLine.getAttribute("end") - currentLine.getAttribute("start");
@ -117,7 +117,7 @@
if (this.time + delayfix >= this.lyrics[i].startTime && this.time + delayfix <= app.lyrics[i].endTime) { if (this.time + delayfix >= this.lyrics[i].startTime && this.time + delayfix <= app.lyrics[i].endTime) {
if (app.currentLyricsLine != i) { if (app.currentLyricsLine != i) {
app.currentLyricsLine = i; app.currentLyricsLine = i;
if (app.lyricon && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) { if (app.lyricon && app.drawer.open && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) {
this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active"); this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");
this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active") this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active")
if (checkIfScrollIsStatic) { if (checkIfScrollIsStatic) {
@ -127,7 +127,7 @@
}) })
} }
} }
} else if (app.currentLyricsLine == 0) { } else if (app.currentLyricsLine == 0 && app.drawer.open) {
if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`) && !this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.contains("active")) if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`) && !this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.contains("active"))
this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.add("active"); this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.add("active");
} }
@ -135,13 +135,12 @@
} }
} }
try{ try{
try{this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).childNodes.classList.remove("verse-active");} catch(e){ if (app.drawer.open){
try{this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).childNodes.classList.remove("verse-active");} catch(e){}
}
for (child of this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${app.currentLyricsLine}"]`).querySelectorAll(".verse")){ for (child of this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${app.currentLyricsLine}"]`).querySelectorAll(".verse")){
if (this.time + 0.1 >= child.getAttribute("lyricstart") * 1 + child.getAttribute("versestart") * 1){ if (this.time + 0.1 >= child.getAttribute("lyricstart") * 1 + child.getAttribute("versestart") * 1){
child.classList.add("verse-active"); child.classList.add("verse-active");
} else {child.classList.remove("verse-active");} } else {child.classList.remove("verse-active");}}
} }
} catch(e){} } catch(e){}