Skip to content

Remove ImageHandle(long, int) to initialize transparentPixel from client #2663

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
Oct 24, 2025
Merged

Remove ImageHandle(long, int) to initialize transparentPixel from client #2663

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
12 changes: 4 additions & 8 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 @@ -1650,7 +1650,7 @@ private ImageHandle initIconHandle(long[] handles, int zoom) {
OS.DeleteObject(handles[0]);
OS.DeleteObject(handles[1]);
type = SWT.ICON;
return new ImageHandle(hIcon, zoom);
return new ImageHandle(hIcon, zoom, -1);
}

private ImageHandle initBitmapHandle(ImageData imageData, long handle, Integer zoom) {
Expand Down Expand Up @@ -2040,7 +2040,7 @@ private class ExistingImageHandleProviderWrapper extends AbstractImageProviderWr
public ExistingImageHandleProviderWrapper(long handle, int zoomForHandle) {
this.handle = handle;
this.zoomForHandle = zoomForHandle;
ImageHandle imageHandle = new ImageHandle(handle, zoomForHandle);
ImageHandle imageHandle = new ImageHandle(handle, zoomForHandle, -1);

ImageData baseData = imageHandle.getImageData();
this.width = DPIUtil.pixelToPoint(baseData.width, zoomForHandle);
Expand Down Expand Up @@ -2298,7 +2298,7 @@ private ImageHandle createBaseHandle(int zoom) {

private ImageHandle createHandle(int zoom) {
long handle = initHandle(zoom);
ImageHandle imageHandle = new ImageHandle(handle, zoom);
ImageHandle imageHandle = new ImageHandle(handle, zoom, -1);
zoomLevelToImageHandle.put(zoom, imageHandle);
return imageHandle;
}
Expand Down Expand Up @@ -2494,7 +2494,7 @@ ImageHandle initNative(String filename, int zoom) {
long[] hicon = new long[1];
status = Gdip.Bitmap_GetHICON(bitmap, hicon);
handle = hicon[0];
imageMetadata = new ImageHandle(handle, zoom);
imageMetadata = new ImageHandle(handle, zoom, -1);
} else {
type = SWT.BITMAP;
width = Gdip.Image_GetWidth(bitmap);
Expand Down Expand Up @@ -2812,10 +2812,6 @@ class ImageHandle {
final int transparentPixel;
int transparentColor = -1;

ImageHandle(long handle, int zoom) {
this(handle, zoom, -1);
}

ImageHandle(long handle, int zoom, int transparentPixel) {
this.handle = handle;
this.zoom = zoom;
Expand Down
Loading