diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 41472359..933ed9cc 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1580,7 +1580,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1580 | } | 1580 | } |
1581 | */ | 1581 | */ |
1582 | //currPos = event.y - (this._dragAndDropHelperOffset - this.user_layers.scrollTop)- 28; | 1582 | //currPos = event.y - (this._dragAndDropHelperOffset - this.user_layers.scrollTop)- 28; |
1583 | currPos = event.x - 277; | 1583 | |
1584 | currPos = (event.x + this.layout_tracks.scrollLeft) - 277; | ||
1584 | 1585 | ||
1585 | // too much or too little? | 1586 | // too much or too little? |
1586 | if (currPos < this.trackRepetition.childComponents[this.draggingTrackId-1]._keyframeMinPosition) { | 1587 | if (currPos < this.trackRepetition.childComponents[this.draggingTrackId-1]._keyframeMinPosition) { |
@@ -1613,7 +1614,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1613 | * | 1614 | * |
1614 | */ | 1615 | */ |
1615 | 1616 | ||
1616 | var currPos = event.x - 274, | 1617 | var currPos = (event.x + this.layout_tracks.scrollLeft) - 277, |
1617 | currentMillisecPerPixel = Math.floor(this.millisecondsOffset / 80), | 1618 | currentMillisecPerPixel = Math.floor(this.millisecondsOffset / 80), |
1618 | currentMillisec = 0, | 1619 | currentMillisec = 0, |
1619 | i = 0, | 1620 | i = 0, |