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): do not reset layer on first render

Browse Source
This commit is contained in:
psychedelicious 2024-07-31 20:22:00 +10:00
parent 200338ed72
commit ea1526689a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts
View File

@ -325,6 +325,8 @@ export class CanvasLayer extends CanvasEntity {
if (didUpdate) { if (didUpdate) {
this.calculateBbox(); this.calculateBbox();
} }
this._isFirstRender = false;
} }
updateOpacity(arg?: { opacity: number }) { updateOpacity(arg?: { opacity: number }) {
@ -392,7 +394,8 @@ export class CanvasLayer extends CanvasEntity {
// If the bbox has no width or height, that means the layer is fully transparent. This can happen if it is only // If the bbox has no width or height, that means the layer is fully transparent. This can happen if it is only
// eraser lines, fully clipped brush lines or if it has been fully erased. // eraser lines, fully clipped brush lines or if it has been fully erased.
if (this.bbox.width === 0 || this.bbox.height === 0) { if (this.bbox.width === 0 || this.bbox.height === 0) {
if (this.objects.size > 0) { // We shouldn't reset on the first render - the bbox will be calculated on the next render
if (!this._isFirstRender && this.objects.size > 0) {
// The layer is fully transparent but has objects - reset it // The layer is fully transparent but has objects - reset it
this._manager.stateApi.onEntityReset({ id: this.id }, 'layer'); this._manager.stateApi.onEntityReset({ id: this.id }, 'layer');
} }
@ -579,6 +582,7 @@ export class CanvasLayer extends CanvasEntity {
this.isPendingBboxCalculation = true; this.isPendingBboxCalculation = true;
if (this.objects.size === 0) { if (this.objects.size === 0) {
this._log.trace('No objects, resetting bbox');
this.rect = this.getDefaultRect(); this.rect = this.getDefaultRect();
this.bbox = this.getDefaultRect(); this.bbox = this.getDefaultRect();
this.isPendingBboxCalculation = false; this.isPendingBboxCalculation = false;
@ -632,9 +636,9 @@ export class CanvasLayer extends CanvasEntity {
this._manager.requestBbox( this._manager.requestBbox(
{ buffer: imageData.data.buffer, width: imageData.width, height: imageData.height }, { buffer: imageData.data.buffer, width: imageData.width, height: imageData.height },
(extents) => { (extents) => {
this.rect = deepClone(rect);
if (extents) { if (extents) {
const { minX, minY, maxX, maxY } = extents; const { minX, minY, maxX, maxY } = extents;
this.rect = deepClone(rect);
this.bbox = { this.bbox = {
x: rect.x + minX, x: rect.x + minX,
y: rect.y + minY, y: rect.y + minY,
@ -642,7 +646,8 @@ export class CanvasLayer extends CanvasEntity {
height: maxY - minY, height: maxY - minY,
}; };
} else { } else {
this.bbox = deepClone(rect); this.bbox = this.getDefaultRect();
this.rect = this.getDefaultRect();
} }
this.isPendingBboxCalculation = false; this.isPendingBboxCalculation = false;
this._log.trace({ bbox: this.bbox, rect: this.rect, extents }, `Got bbox from worker`); this._log.trace({ bbox: this.bbox, rect: this.rect, extents }, `Got bbox from worker`);