From 473869b8ede0edbb89bf34d12334fae79ad907a2 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:31:39 +1100
Subject: [PATCH] Fixes mask brush preview color

---
 .../components/IAICanvasToolPreview.tsx       | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/frontend/src/features/canvas/components/IAICanvasToolPreview.tsx b/frontend/src/features/canvas/components/IAICanvasToolPreview.tsx
index 59c57fcf4f..85c4978383 100644
--- a/frontend/src/features/canvas/components/IAICanvasToolPreview.tsx
+++ b/frontend/src/features/canvas/components/IAICanvasToolPreview.tsx
@@ -28,24 +28,11 @@ const canvasBrushPreviewSelector = createSelector(
       stageScale,
     } = canvas;
 
-    let fill = '';
-
-    if (layer === 'mask') {
-      fill = rgbaColorToString({ ...maskColor, a: 0.5 });
-    } else if (tool === 'colorPicker') {
-      fill = rgbaColorToString(colorPickerColor);
-    } else {
-      fill = rgbaColorToString(brushColor);
-    }
-
     return {
       cursorPosition,
       width,
       height,
       radius: brushSize / 2,
-      colorPickerSize: COLOR_PICKER_SIZE / stageScale,
-      colorPickerOffset: COLOR_PICKER_SIZE / 2 / stageScale,
-      colorPickerCornerRadius: COLOR_PICKER_SIZE / 5 / stageScale,
       colorPickerOuterRadius: COLOR_PICKER_SIZE / stageScale,
       colorPickerInnerRadius:
         (COLOR_PICKER_SIZE - COLOR_PICKER_STROKE_RADIUS + 1) / stageScale,
@@ -53,6 +40,7 @@ const canvasBrushPreviewSelector = createSelector(
       brushColorString: rgbaColorToString(brushColor),
       colorPickerColorString: rgbaColorToString(colorPickerColor),
       tool,
+      layer,
       shouldShowBrush,
       shouldDrawBrushPreview:
         !(
@@ -83,12 +71,10 @@ const IAICanvasToolPreview = (props: GroupConfig) => {
     radius,
     maskColorString,
     tool,
+    layer,
     shouldDrawBrushPreview,
     dotRadius,
     strokeWidth,
-    colorPickerSize,
-    colorPickerOffset,
-    colorPickerCornerRadius,
     brushColorString,
     colorPickerColorString,
     colorPickerInnerRadius,
@@ -124,7 +110,7 @@ const IAICanvasToolPreview = (props: GroupConfig) => {
             x={cursorPosition ? cursorPosition.x : width / 2}
             y={cursorPosition ? cursorPosition.y : height / 2}
             radius={radius}
-            fill={brushColorString}
+            fill={layer === 'mask' ? maskColorString : brushColorString}
             globalCompositeOperation={
               tool === 'eraser' ? 'destination-out' : 'source-over'
             }