diff options
author | bob <bcz@cs.brown.edu> | 2019-09-13 09:18:12 -0400 |
---|---|---|
committer | bob <bcz@cs.brown.edu> | 2019-09-13 09:18:12 -0400 |
commit | 32861c7cfcac8c03be5692fb98b5a7dc7786be83 (patch) | |
tree | 3cb09464277cc020fc1ab772381cc4cbd828b091 /src/client/views/nodes/CollectionFreeFormDocumentView.tsx | |
parent | b3d9c4e3d8c7c425df41b2d8555a7d242771a823 (diff) | |
parent | e241e61d6521ff5d63de1292f2b4269493f5d7cc (diff) |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/nodes/CollectionFreeFormDocumentView.tsx')
-rw-r--r-- | src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx index 07dd1cae7..082e5c5e3 100644 --- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx @@ -74,7 +74,10 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF } borderRounding = () => { + let ruleProvider = this.props.Document.ruleProvider as Doc; + let ruleRounding = ruleProvider ? StrCast(Doc.GetProto(ruleProvider)["ruleRounding_" + NumCast(this.props.Document.heading)]) : undefined; let br = StrCast(this.layoutDoc.layout instanceof Doc ? this.layoutDoc.layout.borderRounding : this.props.Document.borderRounding); + br = !br && ruleRounding ? ruleRounding : br; if (br.endsWith("%")) { let percent = Number(br.substr(0, br.length - 1)) / 100; let nativeDim = Math.min(NumCast(this.layoutDoc.nativeWidth), NumCast(this.layoutDoc.nativeHeight)); |