From 1daad3ce73b3076a4b5798b373b4069c2f0b3889 Mon Sep 17 00:00:00 2001
From: Kylart <Kylart.dev@gmail.com>
Date: Wed, 15 Jan 2020 21:21:20 +0100
Subject: [PATCH] Fixed timeline value

---
 src/renderer/components/video/controls.vue | 2 +-
 src/renderer/components/video/layout.vue   | 3 +--
 src/renderer/components/video/player.vue   | 3 ++-
 src/renderer/components/video/wrapper.vue  | 8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/video/controls.vue b/src/renderer/components/video/controls.vue
index f7c7f34..76ab837 100644
--- a/src/renderer/components/video/controls.vue
+++ b/src/renderer/components/video/controls.vue
@@ -50,7 +50,7 @@
                   dark, hide-details, color='secondary accent-2',
                   :step='0',
                   :buffer='buffered',
-                  :value='timeline / 10',
+                  :value='timeline',
                   :duration='duration',
                   @input='changeTimeline'
                 )
diff --git a/src/renderer/components/video/layout.vue b/src/renderer/components/video/layout.vue
index 208803f..52ea906 100644
--- a/src/renderer/components/video/layout.vue
+++ b/src/renderer/components/video/layout.vue
@@ -37,7 +37,6 @@ export default {
     'hasSubs',
     'subs',
     'currentLang',
-    // 'waiting',
     'pause'
   ],
 
@@ -54,7 +53,7 @@ export default {
       return {
         ...this.$store.state.streaming.player.controls,
         timeline: this.timeline,
-        currentTime: this.formatTime(this.timeline),
+        currentTime: this.formatTime((this.timeline / 100) * this.duration),
         duration: this.formatTime(this.duration),
         buffered: this.buffered,
 
diff --git a/src/renderer/components/video/player.vue b/src/renderer/components/video/player.vue
index 24351b5..18591d6 100644
--- a/src/renderer/components/video/player.vue
+++ b/src/renderer/components/video/player.vue
@@ -63,7 +63,7 @@ export default {
       layoutShow: true,
 
       propertyMap: {
-        'time-pos': 'timeline',
+        'percent-pos': 'timeline',
         'media-title': 'name'
       },
 
@@ -109,6 +109,7 @@ export default {
       [
         'pause',
         'time-pos',
+        'percent-pos',
         'duration',
         'media-title',
         'track-list/count'
diff --git a/src/renderer/components/video/wrapper.vue b/src/renderer/components/video/wrapper.vue
index 7514cd0..ed2fb39 100644
--- a/src/renderer/components/video/wrapper.vue
+++ b/src/renderer/components/video/wrapper.vue
@@ -34,14 +34,16 @@ export default {
     window.addEventListener('click', this.click)
     window.addEventListener('contextmenu', this.click)
     window.addEventListener('wheel', this.wheel)
-    window.addEventListener('keypress', this.keypress)
+
+    window.addEventListener('keydown', this.keypress)
   },
 
   beforeDestroy () {
     window.removeEventListener('click', this.click)
     window.removeEventListener('contextmenu', this.click)
     window.removeEventListener('wheel', this.wheel)
-    window.removeEventListener('keypress', this.keypress)
+
+    window.removeEventListener('keydown', this.keypress)
   },
 
   methods: {
@@ -104,7 +106,7 @@ export default {
       // Ignore exit keys for default keybindings settings.
       if ([
         'q', 'Q', 'ESC', 'POWER', 'STOP',
-        'CLOSE_WIN', 'CLOSE_WIN', 'Ctrl+c',
+        'CLOSE_WIN', 'Ctrl+c',
         'AR_PLAY_HOLD', 'AR_CENTER_HOLD'
       ].includes(key)) return