Skip to content

Fix ImageViewer getCroppedImage() inconsistency after panning operations #3943

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
shannah merged 2 commits into from
Sep 25, 2025
Merged

Fix ImageViewer getCroppedImage() inconsistency after panning operations #3943

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5fbc27
Initial plan
Copilot Sep 25, 2025
3c08165
Fix ImageViewer cropBox calculation to respect viewport bounds
Copilot Sep 25, 2025
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
42 changes: 40 additions & 2 deletions CodenameOne/src/com/codename1/components/ImageViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,26 @@ private void updatePositions() {
imageDrawHeight = prefH;
imageX = prefX;
imageY = prefY;
cropBox.set(-imageY/(double)imageDrawHeight, (imageX + imageDrawWidth - getWidth())/(double)imageDrawWidth, (imageY + imageDrawHeight - getHeight())/(double)imageDrawHeight, -imageX/(double)imageDrawWidth);

// Apply the same constraints used in paint() method to ensure cropBox matches what's actually visible
int constrainedImageX = imageX;
int constrainedImageY = imageY;

if (imageDrawWidth > getInnerWidth()) {
constrainedImageX = Math.max(
Math.min(0, imageX),
-imageDrawWidth + getInnerWidth()
);
}

if (imageDrawHeight > getInnerHeight()) {
constrainedImageY = Math.max(
Math.min(0, imageY),
-imageDrawHeight + getInnerHeight()
);
}

cropBox.set(-constrainedImageY/(double)imageDrawHeight, (constrainedImageX + imageDrawWidth - getWidth())/(double)imageDrawWidth, (constrainedImageY + imageDrawHeight - getHeight())/(double)imageDrawHeight, -constrainedImageX/(double)imageDrawWidth);
return;
}
int iW = image.getWidth();
Expand All @@ -529,7 +548,26 @@ private void updatePositions() {

imageY += (getInnerHeight() - imageDrawHeight)/2;
}
cropBox.set(-imageY/(double)imageDrawHeight, (imageX + imageDrawWidth - getWidth())/(double)imageDrawWidth, (imageY + imageDrawHeight - getHeight())/(double)imageDrawHeight, -imageX/(double)imageDrawWidth);

// Apply the same constraints used in paint() method to ensure cropBox matches what's actually visible
int constrainedImageX = imageX;
int constrainedImageY = imageY;

if (imageDrawWidth > getInnerWidth()) {
constrainedImageX = Math.max(
Math.min(0, imageX),
-imageDrawWidth + getInnerWidth()
);
}

if (imageDrawHeight > getInnerHeight()) {
constrainedImageY = Math.max(
Math.min(0, imageY),
-imageDrawHeight + getInnerHeight()
);
}

cropBox.set(-constrainedImageY/(double)imageDrawHeight, (constrainedImageX + imageDrawWidth - getWidth())/(double)imageDrawWidth, (constrainedImageY + imageDrawHeight - getHeight())/(double)imageDrawHeight, -constrainedImageX/(double)imageDrawWidth);
}

/**
Expand Down