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(ui): set buffered rect color to full alpha

Browse Source
This commit is contained in:
psychedelicious 2024-07-05 10:44:47 +10:00
parent f2279ecadd
commit 7204844bcb
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/src/features/controlLayers/konva/CanvasInpaintMask.ts
View File

@ -76,6 +76,8 @@ export class CanvasInpaintMask {
if (this.drawingBuffer) { if (this.drawingBuffer) {
if (this.drawingBuffer.type === 'brush_line') { if (this.drawingBuffer.type === 'brush_line') {
this.drawingBuffer.color = RGBA_RED; this.drawingBuffer.color = RGBA_RED;
} else if (this.drawingBuffer.type === 'rect_shape') {
this.drawingBuffer.color = RGBA_RED;
} }
await this.renderObject(this.drawingBuffer, true); await this.renderObject(this.drawingBuffer, true);
@ -92,7 +94,7 @@ export class CanvasInpaintMask {
} else if (this.drawingBuffer.type === 'eraser_line') { } else if (this.drawingBuffer.type === 'eraser_line') {
this.manager.stateApi.onEraserLineAdded2({ id: this.id, eraserLine: this.drawingBuffer }, 'inpaint_mask'); this.manager.stateApi.onEraserLineAdded2({ id: this.id, eraserLine: this.drawingBuffer }, 'inpaint_mask');
} else if (this.drawingBuffer.type === 'rect_shape') { } else if (this.drawingBuffer.type === 'rect_shape') {
this.manager.stateApi.onRectShapeAdded2({ id: this.id, rectShape: this.drawingBuffer }, 'layer'); this.manager.stateApi.onRectShapeAdded2({ id: this.id, rectShape: this.drawingBuffer }, 'inpaint_mask');
} }
this.setDrawingBuffer(null); this.setDrawingBuffer(null);
} }

5
invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts
View File

@ -76,7 +76,10 @@ export class CanvasRegion {
if (this.drawingBuffer) { if (this.drawingBuffer) {
if (this.drawingBuffer.type === 'brush_line') { if (this.drawingBuffer.type === 'brush_line') {
this.drawingBuffer.color = RGBA_RED; this.drawingBuffer.color = RGBA_RED;
} else if (this.drawingBuffer.type === 'rect_shape') {
this.drawingBuffer.color = RGBA_RED;
} }
await this.renderObject(this.drawingBuffer, true); await this.renderObject(this.drawingBuffer, true);
this.updateGroup(true); this.updateGroup(true);
} }
@ -91,7 +94,7 @@ export class CanvasRegion {
} else if (this.drawingBuffer.type === 'eraser_line') { } else if (this.drawingBuffer.type === 'eraser_line') {
this.manager.stateApi.onEraserLineAdded2({ id: this.id, eraserLine: this.drawingBuffer }, 'regional_guidance'); this.manager.stateApi.onEraserLineAdded2({ id: this.id, eraserLine: this.drawingBuffer }, 'regional_guidance');
} else if (this.drawingBuffer.type === 'rect_shape') { } else if (this.drawingBuffer.type === 'rect_shape') {
this.manager.stateApi.onRectShapeAdded2({ id: this.id, rectShape: this.drawingBuffer }, 'layer'); this.manager.stateApi.onRectShapeAdded2({ id: this.id, rectShape: this.drawingBuffer }, 'regional_guidance');
} }
this.setDrawingBuffer(null); this.setDrawingBuffer(null);
} }

25
invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool.ts
View File

@ -121,7 +121,6 @@ export class CanvasTool {
const currentFill = this.manager.stateApi.getCurrentFill(); const currentFill = this.manager.stateApi.getCurrentFill();
const selectedEntity = this.manager.stateApi.getSelectedEntity(); const selectedEntity = this.manager.stateApi.getSelectedEntity();
const cursorPos = this.manager.stateApi.getLastCursorPos(); const cursorPos = this.manager.stateApi.getLastCursorPos();
const lastMouseDownPos = this.manager.stateApi.getLastMouseDownPos();
const isDrawing = this.manager.stateApi.getIsDrawing(); const isDrawing = this.manager.stateApi.getIsDrawing();
const isMouseDown = this.manager.stateApi.getIsMouseDown(); const isMouseDown = this.manager.stateApi.getIsMouseDown();
@ -215,18 +214,18 @@ export class CanvasTool {
this.brush.group.visible(false); this.brush.group.visible(false);
this.eraser.group.visible(true); this.eraser.group.visible(true);
// this.rect.group.visible(false); // this.rect.group.visible(false);
// } else if (cursorPos && lastMouseDownPos && tool === 'rect') { // } else if (cursorPos && lastMouseDownPos && tool === 'rect') {
// this.rect.fillRect.setAttrs({ // this.rect.fillRect.setAttrs({
// x: Math.min(cursorPos.x, lastMouseDownPos.x), // x: Math.min(cursorPos.x, lastMouseDownPos.x),
// y: Math.min(cursorPos.y, lastMouseDownPos.y), // y: Math.min(cursorPos.y, lastMouseDownPos.y),
// width: Math.abs(cursorPos.x - lastMouseDownPos.x), // width: Math.abs(cursorPos.x - lastMouseDownPos.x),
// height: Math.abs(cursorPos.y - lastMouseDownPos.y), // height: Math.abs(cursorPos.y - lastMouseDownPos.y),
// fill: rgbaColorToString(currentFill), // fill: rgbaColorToString(currentFill),
// visible: true, // visible: true,
// }); // });
// this.brush.group.visible(false); // this.brush.group.visible(false);
// this.eraser.group.visible(false); // this.eraser.group.visible(false);
// this.rect.group.visible(true); // this.rect.group.visible(true);
} else { } else {
this.brush.group.visible(false); this.brush.group.visible(false);
this.eraser.group.visible(false); this.eraser.group.visible(false);