From be753f6c952d8f1fc324d2c076095416b6d98a35 Mon Sep 17 00:00:00 2001 From: andrewdkim Date: Sat, 7 Dec 2019 17:04:29 -0500 Subject: bug fixes --- src/client/views/animationtimeline/Keyframe.tsx | 5 ++++- src/client/views/animationtimeline/Track.tsx | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/views/animationtimeline/Keyframe.tsx b/src/client/views/animationtimeline/Keyframe.tsx index a2d0a644e..e8b75eef4 100644 --- a/src/client/views/animationtimeline/Keyframe.tsx +++ b/src/client/views/animationtimeline/Keyframe.tsx @@ -300,7 +300,10 @@ export class Keyframe extends React.Component { } else if (NumCast(this.keyframes[1].time) + offset >= NumCast(this.keyframes[2].time)) { this.regiondata.position = NumCast(this.keyframes[2].time) - this.regiondata.fadeIn; this.regiondata.duration = NumCast(this.keyframes[this.keyframes.length - 1].time) - NumCast(this.keyframes[2].time) + this.regiondata.fadeIn; - } else { + } else if (NumCast(this.keyframes[0].time) + offset <= 0){ + this.regiondata.position = 0; + this.regiondata.duration = NumCast(this.keyframes[this.keyframes.length - 1].time); + }else { this.regiondata.duration -= offset; this.regiondata.position += offset; } diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx index a3aa62a31..22b83f055 100644 --- a/src/client/views/animationtimeline/Track.tsx +++ b/src/client/views/animationtimeline/Track.tsx @@ -45,6 +45,17 @@ export class Track extends React.Component { "baseLayout", "backgroundLayout", "layout", + "title", + "AnimationLength", + "author", + "baseProto", + "creationDate", + "isATOn", + "isPrototype", + "lastOpened", + "proto", + "type", + "zIndex" ]; private readonly MAX_TITLE_HEIGHT = 75; private _trackHeight = 0; -- cgit v1.2.3-70-g09d2