aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2019-12-07 17:04:29 -0500
committerandrewdkim <adkim414@gmail.com>2019-12-07 17:04:29 -0500
commitbe753f6c952d8f1fc324d2c076095416b6d98a35 (patch)
tree05e8a6ab7af128ad3ba174eb5f92294afcc056dc /src
parent5bf4dfa43e07a21bc5cb96b3b98f1a6ddb75b903 (diff)
bug fixes
Diffstat (limited to 'src')
-rw-r--r--src/client/views/animationtimeline/Keyframe.tsx5
-rw-r--r--src/client/views/animationtimeline/Track.tsx11
2 files changed, 15 insertions, 1 deletions
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<IProps> {
} 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<IProps> {
"baseLayout",
"backgroundLayout",
"layout",
+ "title",
+ "AnimationLength",
+ "author",
+ "baseProto",
+ "creationDate",
+ "isATOn",
+ "isPrototype",
+ "lastOpened",
+ "proto",
+ "type",
+ "zIndex"
];
private readonly MAX_TITLE_HEIGHT = 75;
private _trackHeight = 0;