From e486ed751e3a8deb21b0b57805eb58c100133f55 Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 3 Aug 2019 21:52:28 +0430 Subject: [PATCH 1/3] Make theme apply to background by class --- src/renderer/layouts/PlayerBar.vue | 9 ++++++++- src/renderer/utility/HorizontalScrollPlugin.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/renderer/layouts/PlayerBar.vue b/src/renderer/layouts/PlayerBar.vue index 0900fa0..8919396 100644 --- a/src/renderer/layouts/PlayerBar.vue +++ b/src/renderer/layouts/PlayerBar.vue @@ -34,7 +34,7 @@ -
+
@@ -155,6 +155,7 @@ export default { onArtworkLoad () { let img = this.$el.getElementsByTagName('img')[0] let controlIcons = this.$el.getElementsByClassName('control-buttons')[0].children + let themeBackground = this.$el.getElementsByClassName('theme-background') color(img.src, (_, color) => { this.wavesurfer.setProgressColor(`#${color}`) this.wavesurfer.minimap.params.progressColor = `#${color}` @@ -181,6 +182,12 @@ export default { controlIcons[child].style.backgroundColor = `#${color}` } } + for (let item in themeBackground) { + console.log(item) + if (typeof themeBackground[item] === 'object') { + themeBackground[item].style.backgroundColor = `#${color}` + } + } }) }, playNext () { diff --git a/src/renderer/utility/HorizontalScrollPlugin.js b/src/renderer/utility/HorizontalScrollPlugin.js index f8dfbed..ebb90e0 100644 --- a/src/renderer/utility/HorizontalScrollPlugin.js +++ b/src/renderer/utility/HorizontalScrollPlugin.js @@ -5,6 +5,7 @@ export default class HorizontalScrollPlugin extends Scrollbar.ScrollbarPlugin { transformDelta (delta, fromEvent) { const { x, y } = delta if (!this.scrollbar.options.horizontal) { + console.log('wtf', x) return { y: y, x: 0 From bf5f4f625db4e5aeaf9dae51a6b2252c9ef828aa Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 3 Aug 2019 22:09:00 +0430 Subject: [PATCH 2/3] Patched the player next/previous and auto play logic --- src/renderer/layouts/PlayerBar.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/renderer/layouts/PlayerBar.vue b/src/renderer/layouts/PlayerBar.vue index 8919396..4f5de3c 100644 --- a/src/renderer/layouts/PlayerBar.vue +++ b/src/renderer/layouts/PlayerBar.vue @@ -57,7 +57,8 @@ export default { playingStatus: false, isFavorited: false, duration: '00:00', - isFullscreen: false + isFullscreen: false, + updateCurrent: false } }, computed: mapGetters(['fullscreenStatus', 'currentlyPlaying', 'playerQueue']), @@ -65,7 +66,10 @@ export default { this.drawVisualizer() }, updated () { - this.wavesurfer.load(this.playerQueue[this.currentlyPlaying].stream) + if (this.updateCurrent) { + this.wavesurfer.load(this.playerQueue[this.currentlyPlaying].stream) + this.updateCurrent = false + } }, methods: { drawVisualizer () { @@ -196,6 +200,7 @@ export default { map.style['height'] = '0%' window.setTimeout(() => { this.playQueueItem(this.currentlyPlaying + 1) + this.updateCurrent = true }, 500) }, playPrevious () { @@ -204,6 +209,7 @@ export default { map.style['height'] = '0%' window.setTimeout(() => { this.playQueueItem(this.currentlyPlaying - 1) + this.updateCurrent = true }, 500) }, play () { From e265ff289a800369a18d713ff40e23ab37f4d4fa Mon Sep 17 00:00:00 2001 From: Nikan Dalvand Date: Sat, 3 Aug 2019 22:10:05 +0430 Subject: [PATCH 3/3] Remove redundent console log --- src/renderer/layouts/PlayerBar.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/renderer/layouts/PlayerBar.vue b/src/renderer/layouts/PlayerBar.vue index 4f5de3c..1bf8384 100644 --- a/src/renderer/layouts/PlayerBar.vue +++ b/src/renderer/layouts/PlayerBar.vue @@ -187,7 +187,6 @@ export default { } } for (let item in themeBackground) { - console.log(item) if (typeof themeBackground[item] === 'object') { themeBackground[item].style.backgroundColor = `#${color}` }