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

tidy(ui): CanvasBbox

Browse Source
This commit is contained in:
psychedelicious 2024-07-17 14:30:17 +10:00
parent 6eafe53b2d
commit 178e1cc50b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
invokeai/frontend/web/src/features/controlLayers/konva/CanvasBbox.ts
View File

@ -10,12 +10,7 @@ export class CanvasBbox {
static GROUP_NAME = `${CanvasBbox.BASE_NAME}_group`; static GROUP_NAME = `${CanvasBbox.BASE_NAME}_group`;
static RECT_NAME = `${CanvasBbox.BASE_NAME}_rect`; static RECT_NAME = `${CanvasBbox.BASE_NAME}_rect`;
static TRANSFORMER_NAME = `${CanvasBbox.BASE_NAME}_transformer`; static TRANSFORMER_NAME = `${CanvasBbox.BASE_NAME}_transformer`;
static ALL_ANCHORS: string[] = [
manager: CanvasManager;
konva: { group: Konva.Group; rect: Konva.Rect; transformer: Konva.Transformer };
ALL_ANCHORS: string[] = [
'top-left', 'top-left',
'top-center', 'top-center',
'top-right', 'top-right',
@ -25,8 +20,16 @@ export class CanvasBbox {
'bottom-center', 'bottom-center',
'bottom-right', 'bottom-right',
]; ];
CORNER_ANCHORS: string[] = ['top-left', 'top-right', 'bottom-left', 'bottom-right']; static CORNER_ANCHORS: string[] = ['top-left', 'top-right', 'bottom-left', 'bottom-right'];
NO_ANCHORS: string[] = []; static NO_ANCHORS: string[] = [];
manager: CanvasManager;
konva: {
group: Konva.Group;
rect: Konva.Rect;
transformer: Konva.Transformer;
};
constructor(manager: CanvasManager) { constructor(manager: CanvasManager) {
this.manager = manager; this.manager = manager;
@ -44,7 +47,10 @@ export class CanvasBbox {
listening: false, listening: false,
strokeEnabled: false, strokeEnabled: false,
draggable: true, draggable: true,
...this.manager.stateApi.getBbox(), x: bbox.rect.x,
y: bbox.rect.y,
width: bbox.rect.width,
height: bbox.rect.height,
}), }),
transformer: new Konva.Transformer({ transformer: new Konva.Transformer({
name: CanvasBbox.TRANSFORMER_NAME, name: CanvasBbox.TRANSFORMER_NAME,
@ -151,7 +157,7 @@ export class CanvasBbox {
// If shift is held and we are resizing from a corner, retain aspect ratio - needs special handling. We skip this // If shift is held and we are resizing from a corner, retain aspect ratio - needs special handling. We skip this
// if alt/opt is held - this requires math too big for my brain. // if alt/opt is held - this requires math too big for my brain.
if (shift && this.CORNER_ANCHORS.includes(anchor) && !alt) { if (shift && CanvasBbox.CORNER_ANCHORS.includes(anchor) && !alt) {
// Fit the bbox to the last aspect ratio // Fit the bbox to the last aspect ratio
let fittedWidth = Math.sqrt(width * height * $aspectRatioBuffer.get()); let fittedWidth = Math.sqrt(width * height * $aspectRatioBuffer.get());
let fittedHeight = fittedWidth / $aspectRatioBuffer.get(); let fittedHeight = fittedWidth / $aspectRatioBuffer.get();
@ -235,7 +241,7 @@ export class CanvasBbox {
}); });
this.konva.transformer.setAttrs({ this.konva.transformer.setAttrs({
listening: toolState.selected === 'bbox', listening: toolState.selected === 'bbox',
enabledAnchors: toolState.selected === 'bbox' ? this.ALL_ANCHORS : this.NO_ANCHORS, enabledAnchors: toolState.selected === 'bbox' ? CanvasBbox.ALL_ANCHORS : CanvasBbox.NO_ANCHORS,
}); });
} }
} }