Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes mask brush preview color

Browse Source
This commit is contained in:
psychedelicious 2022-11-24 14:31:39 +11:00 committed by blessedcoolant
parent c8c1b3e217
commit 473869b8ed
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/features/canvas/components/IAICanvasToolPreview.tsx
View File

@ -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'
}