diff options
| author | bobzel <zzzman@gmail.com> | 2023-06-14 13:53:23 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-06-14 13:53:23 -0400 |
| commit | bf1198fbe73847087b1ec8e00a43306816b3508a (patch) | |
| tree | 05987a7938cc229ba23f2aa6cc12cbf6eddc0e31 /src | |
| parent | e8760b8e8836f8467fb7b98f5462a32eecd748cd (diff) | |
another fix for closed ink masks that aren't filled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/InkingStroke.tsx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |