From bf1198fbe73847087b1ec8e00a43306816b3508a Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 14 Jun 2023 13:53:23 -0400
Subject: another fix for closed ink masks that aren't filled.

---
 src/client/views/InkingStroke.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index 28d039278..111f1695f 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -413,13 +413,13 @@ export class InkingStroke extends ViewBoxBaseComponent<FieldViewProps>() {
                 inkData,
                 inkLeft,
                 inkTop,
-                highlightColor,
+                mask && highlightColor === 'transparent' ? strokeColor : highlightColor,
                 inkStrokeWidth,
                 inkStrokeWidth + (fillColor ? (closed ? 2 : (highlightIndex ?? 0) + 2) : 2),
                 StrCast(this.layoutDoc.stroke_lineJoin),
                 StrCast(this.layoutDoc.stroke_lineCap),
                 StrCast(this.layoutDoc.stroke_bezier),
-                !closed || fillColor === 'transparent' ? 'none' : fillColor,
+                !closed || !fillColor || DashColor(fillColor).alpha() === 0 ? 'none' : fillColor,
                 '',
                 '',
                 markerScale,
@@ -460,7 +460,7 @@ export class InkingStroke extends ViewBoxBaseComponent<FieldViewProps>() {
                     }}
                     {...interactions}>
                     {clickableLine(this.onPointerDown, isInkMask)}
-                    {isInkMask && (!closed || (fillColor && DashColor(fillColor).alpha() !== 0)) ? null : inkLine}
+                    {isInkMask ? null : inkLine}
                 </svg>
                 {!closed || (!RTFCast(this.rootDoc.text)?.Text && (!this.props.isSelected() || Doc.UserDoc().activeInkHideTextLabels)) ? null : (
                     <div
-- 
cgit v1.2.3-70-g09d2