Skip to content

[win32] No handle creation on Image::getBounds #1643

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
HeikoKlare merged 1 commit into from
Dec 10, 2024
Merged

[win32] No handle creation on Image::getBounds #1643

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
15 changes: 11 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public final class Image extends Resource implements Drawable {
*/
static final int DEFAULT_SCANLINE_PAD = 4;

private HashMap<Integer, ImageHandle> zoomLevelToImageHandle = new HashMap<>();
private Map<Integer, ImageHandle> zoomLevelToImageHandle = new HashMap<>();

/**
* Prevents uninitialized instances from being created outside the package.
Expand Down Expand Up @@ -1303,8 +1303,14 @@ public Rectangle getBounds() {

Rectangle getBounds(int zoom) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
ImageHandle imageMetadata = getImageMetadata(zoom);
return new Rectangle(0, 0, imageMetadata.width, imageMetadata.height);
ImageHandle imageMetadata;
if (zoomLevelToImageHandle.containsKey(zoom)) {
imageMetadata = zoomLevelToImageHandle.get(zoom);
} else {
imageMetadata = zoomLevelToImageHandle.values().iterator().next();
}
Rectangle rectangle = new Rectangle(0, 0, imageMetadata.width, imageMetadata.height);
return DPIUtil.scaleBounds(rectangle, zoom, imageMetadata.zoom);
}

/**
Expand Down Expand Up @@ -2084,18 +2090,19 @@ public void close() {

private class ImageHandle {
final long handle;
final int zoom;
int height;
int width;

public ImageHandle(long handle, int zoom) {
Rectangle bounds = getBoundsInPixelsFromNative(handle);
this.handle = handle;
this.zoom = zoom;
this.height = bounds.height;
this.width = bounds.width;
setImageMetadataForHandle(this, zoom);
}


private Rectangle getBoundsInPixelsFromNative(long handle) {
switch (type) {
case SWT.BITMAP:
Expand Down
Loading