aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2020-05-16 00:01:06 -0400
committerBob Zeleznik <zzzman@gmail.com>2020-05-16 00:01:06 -0400
commita0dc46dc565418fef9a257508a92c788c4ec50af (patch)
treef0b534e40e9132f42b7941c4076b0506fb126852 /src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
parent08b6bf8b51ab631c8cfe9c3e12bfb0ae2dd7b4c7 (diff)
fixed some issues with frame animation. added comic rendering mode. added server certficate keys to get SSL to work?
Diffstat (limited to 'src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx')
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 4be671a76..d27f3bb0d 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -155,6 +155,10 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
@undoBatch
@action
prevKeyframe = (): void => {
+ if (this.props.Document.timecode === undefined) {
+ this.props.Document.timecode = 0;
+ CollectionFreeFormDocumentView.setupKeyframes(this.childDocs, 0, this.props.Document);
+ }
CollectionFreeFormDocumentView.gotoKeyframe(this.childDocs.slice());
this.props.Document.timecode = Math.max(0, NumCast(this.props.Document.timecode) - 1);
}
@@ -1095,7 +1099,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
this.backgroundActive ?
true :
(this.props.viewDefDivClick || (engine === "pass" && !this.props.isSelected(true))) ? false : undefined}
- jitterRotation={NumCast(this.props.Document._jitterRotation)}
+ jitterRotation={NumCast(this.props.Document._jitterRotation) || ((Doc.UserDoc().renderStyle === "comic" ? 10 : 0))}
//fitToBox={this.props.fitToBox || BoolCast(this.props.freezeChildDimensions)} // bcz: check this
fitToBox={BoolCast(this.props.freezeChildDimensions)} // bcz: check this
FreezeDimensions={BoolCast(this.props.freezeChildDimensions)}
@@ -1352,14 +1356,14 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
<CollectionFreeFormOverlayView elements={this.elementFunc} />
{this.isAnnotationOverlay ? (null) :
<>
- <div key="fwd" className="backKeyframe" onClick={this.nextKeyframe}>
- <FontAwesomeIcon icon={"caret-right"} size={"lg"} />
+ <div key="back" className="backKeyframe" onClick={this.prevKeyframe}>
+ <FontAwesomeIcon icon={"caret-left"} size={"lg"} />
</div>
- <div key="fwd" className="numKeyframe" >
+ <div key="num" className="numKeyframe" >
{NumCast(this.props.Document.timecode)}
</div>
- <div key="back" className="fwdKeyframe" onClick={this.prevKeyframe}>
- <FontAwesomeIcon icon={"caret-left"} size={"lg"} />
+ <div key="fwd" className="fwdKeyframe" onClick={this.nextKeyframe}>
+ <FontAwesomeIcon icon={"caret-right"} size={"lg"} />
</div>
</>}
<div className={"pullpane-indicator"}