Skip to content

fix(ui): increase padding when fitting layers to stage #7913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

fix(ui): increase padding when fitting layers to stage #7913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions invokeai/frontend/web/src/features/controlLayers/konva/CanvasStageModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,17 @@ type CanvasStageModuleConfig = {
* The factor by which the canvas should be scaled when zooming in/out
*/
SCALE_FACTOR: number;
/**
* The padding in pixels to use when fitting the layers to the stage.
*/
FIT_LAYERS_TO_STAGE_PADDING_PX: number;
};

const DEFAULT_CONFIG: CanvasStageModuleConfig = {
MIN_SCALE: 0.1,
MAX_SCALE: 20,
SCALE_FACTOR: 0.999,
FIT_LAYERS_TO_STAGE_PADDING_PX: 48,
};

export class CanvasStageModule extends CanvasModuleBase {
Expand Down Expand Up @@ -175,18 +180,20 @@ export class CanvasStageModule extends CanvasModuleBase {
return;
}

const padding = 20; // Padding in absolute pixels

const availableWidth = width - padding * 2;
const availableHeight = height - padding * 2;
const availableWidth = width - this.config.FIT_LAYERS_TO_STAGE_PADDING_PX * 2;
const availableHeight = height - this.config.FIT_LAYERS_TO_STAGE_PADDING_PX * 2;

// Make sure we don't accidentally set the scale to something nonsensical, like a negative number, 0 or something
// outside the valid range
const scale = this.constrainScale(
Math.min(Math.min(availableWidth / rect.width, availableHeight / rect.height), 1)
);
const x = Math.floor(-rect.x * scale + padding + (availableWidth - rect.width * scale) / 2);
const y = Math.floor(-rect.y * scale + padding + (availableHeight - rect.height * scale) / 2);
const x = Math.floor(
-rect.x * scale + this.config.FIT_LAYERS_TO_STAGE_PADDING_PX + (availableWidth - rect.width * scale) / 2
);
const y = Math.floor(
-rect.y * scale + this.config.FIT_LAYERS_TO_STAGE_PADDING_PX + (availableHeight - rect.height * scale) / 2
);

this.konva.stage.setAttrs({
x,
Expand Down