From 374f14fc351a23d16a168e4a1809234deba91bdf Mon Sep 17 00:00:00 2001 From: bobzel Date: Wed, 13 Feb 2019 20:19:50 -0500 Subject: fixed transform order problem --- src/client/views/collections/CollectionFreeFormView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/views/collections/CollectionFreeFormView.tsx b/src/client/views/collections/CollectionFreeFormView.tsx index 7947b1c51..93efcc1be 100644 --- a/src/client/views/collections/CollectionFreeFormView.tsx +++ b/src/client/views/collections/CollectionFreeFormView.tsx @@ -211,7 +211,7 @@ export class CollectionFreeFormView extends CollectionViewBase { getTransform = (): Transform => { const [x, y] = this.translate; - return this.props.GetTransform().translate(-COLLECTION_BORDER_WIDTH, -COLLECTION_BORDER_WIDTH).transform(this.getLocalTransform().inverse()) + return this.getLocalTransform().inverse().translate(-COLLECTION_BORDER_WIDTH, -COLLECTION_BORDER_WIDTH).transform(this.props.GetTransform()) } getLocalTransform = (): Transform => { -- cgit v1.2.3-70-g09d2 From 61ff7c05bdddf3228454abcd015b0a4383b75b61 Mon Sep 17 00:00:00 2001 From: bobzel Date: Wed, 13 Feb 2019 20:30:59 -0500 Subject: fixed doc decoration location --- src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx index 54bc7327b..f10d8680f 100644 --- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx @@ -94,7 +94,7 @@ export class CollectionFreeFormDocumentView extends React.Component { - return this.props.GetTransform().translated(this.x, this.y); + return new Transform(-this.x, -this.y, 1).transform(this.props.GetTransform()); } render() { -- cgit v1.2.3-70-g09d2