From 311b2e5b2d33ecae253c3ef02e89964c78512ee2 Mon Sep 17 00:00:00 2001 From: christianrhansen <info@christianhansen.net> Date: Tue, 12 Oct 2021 12:09:05 +0200 Subject: [PATCH 1/3] changed "next frame"-button labels. added 1-second-steps. --- .../timeline/PostAnnotate/TimelinePlayer.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue index ca1a74fa8..6f5737b79 100644 --- a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue +++ b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue @@ -36,10 +36,10 @@ self="bottom left" content-class="no-shadow mb-bg-bg-light" ) - mb-btn(@click.native="frameStep('prev')") - q-icon(name="remove" size="xs") - mb-btn(@click.native="frameStep('next')") - q-icon(name="add" size="xs") + mb-btn(@click.native="frameStep('prev', 'second')") -1s + mb-btn(@click.native="frameStep('prev', 'frame')") -1f + mb-btn(@click.native="frameStep('next', 'frame')") +1f + mb-btn(@click.native="frameStep('next', 'second')") +1s // slider ---------------------------------------- .col @@ -133,11 +133,11 @@ export default { this.playbackRate = val this.$emit('playbackRate', val) }, - frameStep (direction) { - let dir = 1 - if (direction === 'prev') dir = -1 + frameStep (direction, length) { + const dir = direction === 'prev' ? -1 : 1 + const step = length === 'frame' ? 1 / 30 : 1 this.$emit('change', { - value: this.model.slider + (1 / 30 * dir), + value: this.model.slider + (step * dir), pauseVideo: true }) }, -- GitLab From d385b1d92a70f7848999b66c82c0a9bccc0b291b Mon Sep 17 00:00:00 2001 From: christianrhansen <info@christianhansen.net> Date: Tue, 12 Oct 2021 12:24:20 +0200 Subject: [PATCH 2/3] "next frame"-button labels visibility --- src/pages/timeline/PostAnnotate/TimelinePlayer.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue index 6f5737b79..05270b433 100644 --- a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue +++ b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue @@ -34,6 +34,7 @@ :offset=[0, 4] anchor="top left" self="bottom left" + persistent content-class="no-shadow mb-bg-bg-light" ) mb-btn(@click.native="frameStep('prev', 'second')") -1s @@ -93,7 +94,7 @@ export default { slider: 0, volume: 1, playbackRate: 1, - steps: false + steps: true } } }, @@ -121,12 +122,10 @@ export default { }, pause () { this.playing = false - this.model.steps = true this.$emit('pause') }, play () { this.playing = true - this.model.steps = false this.$emit('play') }, onPlaybackRate (val) { -- GitLab From ed986d3536c36177d474b326cbb7264c72a02bfa Mon Sep 17 00:00:00 2001 From: christianrhansen <info@christianhansen.net> Date: Tue, 12 Oct 2021 12:44:29 +0200 Subject: [PATCH 3/3] fixed time bar input --- src/pages/timeline/PostAnnotate/TimelinePlayer.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue index 05270b433..efded0a7e 100644 --- a/src/pages/timeline/PostAnnotate/TimelinePlayer.vue +++ b/src/pages/timeline/PostAnnotate/TimelinePlayer.vue @@ -86,7 +86,6 @@ export default { props: ['duration', 'currentTime', 'paused'], data () { return { - panning: false, playing: false, playbackRates: [0.33, 0.5, 1, 2, 3], playbackRate: 1, @@ -141,17 +140,13 @@ export default { }) }, onInput (val) { - if (this.panning) { - this.$emit('change', { value: val }) - } + this.$emit('change', { value: val }) }, onPan (str) { if (str === 'start') { - this.panning = true this.$emit('startPan', this.model.slider) } else if (str === 'end') { - this.panning = false this.$emit('endPan') } } -- GitLab