From 018dc6993972b8314e35af18a15eee56de016873 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Thu, 19 Apr 2012 13:03:16 +0000
Subject: [PATCH] set width of timelines player timelines to the correct value
 after resize

---
 source/Ox.UI/js/Video/Ox.VideoTimelinePanel.js  | 2 +-
 source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePanel.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePanel.js
index b4691a95..ae3bab2e 100644
--- a/source/Ox.UI/js/Video/Ox.VideoTimelinePanel.js
+++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePanel.js
@@ -266,7 +266,7 @@ Ox.VideoTimelinePanel = function(options, self) {
         } else if (key == 'showAnnotations') {
             that.$element.toggle(1);
         } else if (key == 'width') {
-            self.$player.options({width: value});
+            self.$player.options({width: getPlayerWidth()});
         }
     };
 
diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
index 46e3dafc..e4e4f57c 100644
--- a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
@@ -681,7 +681,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
     }
 
     function setWidth() {
-        self.contentWidth = self.options.width - 2 * self.margin - Ox.UI.SCROLLBAR_SIZE;
+        self.contentWidth = self.options.width - 2 * self.margin;
         self.lines = getLines();
 		Ox.loop(self.lines, function(i) {
             if (self.$lines[i]) {
@@ -692,7 +692,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
                     marginLeft: -i * self.contentWidth + 'px'
                 });
                 self.$timelines[i][1].css({
-                    marginLeft: -i * self.contentWidth + self.videoWidth + 'px'
+                    marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px'
                 });
             } else {
                 addLine(i);