diff options
| author | geireann <60007097+geireann@users.noreply.github.com> | 2020-06-30 03:29:27 +0800 |
|---|---|---|
| committer | geireann <60007097+geireann@users.noreply.github.com> | 2020-06-30 03:29:27 +0800 |
| commit | 73bbc602fb964c82999faccfdde8eeca6fbf08c4 (patch) | |
| tree | 576b41e77fd3280ee282e3ece6effbca39f57901 /src/client/views/animationtimeline | |
| parent | 6b75f84565a5019175b16ee5ea69fc5330aa2c0d (diff) | |
| parent | cb8b5b3d9e735c88b9efdd9b4a444cac40fdedb2 (diff) | |
Merge branch 'master' into mobile_revision_direct
Diffstat (limited to 'src/client/views/animationtimeline')
| -rw-r--r-- | src/client/views/animationtimeline/Timeline.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx index ab984f727..f54bd3aff 100644 --- a/src/client/views/animationtimeline/Timeline.tsx +++ b/src/client/views/animationtimeline/Timeline.tsx @@ -288,13 +288,13 @@ export class Timeline extends React.Component<FieldViewProps> { resetView(doc: Doc) { doc._panX = doc._customOriginX ?? 0; doc._panY = doc._customOriginY ?? 0; - doc.scale = doc._customOriginScale ?? 1; + doc._viewScale = doc._customOriginScale ?? 1; } setView(doc: Doc) { doc._customOriginX = doc._panX; doc._customOriginY = doc._panY; - doc._customOriginScale = doc.scale; + doc._customOriginScale = doc._viewScale; } /** * zooming mechanism (increment and spacing changes) |