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

Fix Inpainting Canvas Rendering

Browse Source
This commit is contained in:
blessedcoolant 2022-11-11 21:26:35 +13:00
parent 6adebf065f
commit 82a53782d0
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
frontend/src/features/canvas/IAICanvas.tsx
View File

@ -1,7 +1,7 @@
// lib // lib
import { MutableRefObject, useEffect, useRef, useState } from 'react'; import { MutableRefObject, useEffect, useRef, useState } from 'react';
import Konva from 'konva'; import Konva from 'konva';
import { Layer, Stage } from 'react-konva'; import { Group, Layer, Stage } from 'react-konva';
import { Image as KonvaImage } from 'react-konva'; import { Image as KonvaImage } from 'react-konva';
import { Stage as StageType } from 'konva/lib/Stage'; import { Stage as StageType } from 'konva/lib/Stage';
@ -233,30 +233,31 @@ const IAICanvas = () => {
<IAICanvasOutpaintingObjects /> <IAICanvasOutpaintingObjects />
<IAICanvasIntermediateImage /> <IAICanvasIntermediateImage />
</Layer> </Layer>
<Layer id={'mask-layer'} visible={isMaskEnabled} listening={false}> <Layer id={'mask-layer'} listening={false}>
<IAICanvasMaskLines visible={true} listening={false} /> <IAICanvasMaskLines visible={isMaskEnabled} listening={false} />
<IAICanvasMaskCompositer listening={false} /> <IAICanvasMaskCompositer
listening={false}
globalCompositeOperation="source-in"
/>
{canvasBgImage && ( <Group globalCompositeOperation="destination-over">
<> {canvasBgImage && (
<KonvaImage <>
image={canvasBgImage} <KonvaImage
listening={false} image={canvasBgImage}
globalCompositeOperation="source-in" listening={false}
visible={shouldInvertMask} visible={!shouldInvertMask}
/> />
<KonvaImage
<KonvaImage image={canvasBgImage}
image={canvasBgImage} listening={false}
listening={false} globalCompositeOperation="source-in"
globalCompositeOperation="source-out" visible={shouldInvertMask}
visible={ />
!shouldInvertMask && shouldShowCheckboardTransparency </>
} )}
/> </Group>
</>
)}
</Layer> </Layer>
<Layer id={'preview-layer'}> <Layer id={'preview-layer'}>
<IAICanvasBoundingBoxPreview visible={shouldShowBoundingBox} /> <IAICanvasBoundingBoxPreview visible={shouldShowBoundingBox} />

2
frontend/src/features/canvas/IAICanvasMaskCompositer.tsx
View File

@ -39,7 +39,7 @@ const IAICanvasMaskCompositer = (props: IAICanvasMaskCompositerProps) => {
height={stageDimensions.height / stageScale} height={stageDimensions.height / stageScale}
width={stageDimensions.width / stageScale} width={stageDimensions.width / stageScale}
fill={maskColorString} fill={maskColorString}
globalCompositeOperation={'source-in'} globalCompositeOperation={'source-over'}
listening={false} listening={false}
{...rest} {...rest}
/> />