Skip to content
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

Jump to bottom

fix(ui): gallery grid calculation #6889

Merged
merged 1 commit into from
Sep 19, 2024
Merged

fix(ui): gallery grid calculation #6889

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
20 changes: 15 additions & 5 deletions invokeai/frontend/web/src/features/gallery/hooks/useGalleryNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const getImagesPerRow = (): number => {
if (!imageEl || !gridEl) {
return 0;
}

const container = gridEl.parentElement;
if (!container) {
return 0;
Expand All @@ -44,16 +43,27 @@ const getImagesPerRow = (): number => {
const imageRect = imageEl.getBoundingClientRect();
const containerRect = container.getBoundingClientRect();

// We need to account for the gap between images
const gridElStyle = window.getComputedStyle(gridEl);
const gap = parseFloat(gridElStyle.gap);

// Validate input values
if (imageRect.width <= 0 || gap < 0) {
if (!imageRect.width || !imageRect.height || !containerRect.width || !containerRect.height) {
// Gallery is too small to fit images or not rendered yet
return 0;
}

// Calculate maximum number of images per row
const imagesPerRow = Math.floor((containerRect.width + 1) / (imageRect.width + gap));
let imagesPerRow = 0;
let spaceUsed = 0;

// Floating point precision can cause imagesPerRow to be 1 too small. Adding 1px to the container size fixes
// this, without the possibility of accidentally adding an extra column.
while (spaceUsed + imageRect.width <= containerRect.width + 1) {
imagesPerRow++; // Increment the number of images
spaceUsed += imageRect.width; // Add image size to the used space
if (spaceUsed + gap <= containerRect.width) {
spaceUsed += gap; // Add gap size to the used space after each image except after the last image
}
}

return imagesPerRow;
};
Expand Down
Loading