aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2023-09-13 14:03:27 -0400
committerbobzel <zzzman@gmail.com>2023-09-13 14:03:27 -0400
commit1aca790f54d5e3494812d0d264ce5a24a86ca94a (patch)
tree587e58e353abe36d615080fd85c2bf46c6c9bf38
parent556f770a4c7e9c9f9df7d8857dd496ff1dedc6e7 (diff)
from last .. fixed dash array and endcaps for filled strokes
-rw-r--r--src/client/util/InteractionUtils.tsx1
-rw-r--r--src/client/views/InkingStroke.tsx6
2 files changed, 3 insertions, 4 deletions
diff --git a/src/client/util/InteractionUtils.tsx b/src/client/util/InteractionUtils.tsx
index 464643b09..4e32ed67f 100644
--- a/src/client/util/InteractionUtils.tsx
+++ b/src/client/util/InteractionUtils.tsx
@@ -162,7 +162,6 @@ export namespace InteractionUtils {
<polygon
style={{ stroke: color }}
strokeLinejoin={lineJoin as any}
- strokeDasharray={dashArray}
strokeWidth={(markerStrokeWidth * 2) / 3}
points={`0 ${-markerStrokeWidth * arrowWidthFactor}, ${markerStrokeWidth * arrowNotchFactor} 0, 0 ${markerStrokeWidth * arrowWidthFactor}, ${arrowLengthFactor * markerStrokeWidth} 0`}
/>
diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index 34502cd64..f5ffff639 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -433,10 +433,10 @@ export class InkingStroke extends ViewBoxBaseComponent<FieldViewProps>() {
StrCast(this.layoutDoc.stroke_lineCap),
StrCast(this.layoutDoc.stroke_bezier),
!closed || !fillColor || DashColor(fillColor).alpha() === 0 ? 'none' : fillColor,
- '',
- '',
+ startMarker,
+ endMarker,
markerScale,
- undefined,
+ StrCast(this.layoutDoc.stroke_dash),
inkScaleX,
inkScaleY,
'',