Skip to content

[win32] refactor Image::init with ImageData #1906

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
Mar 14, 2025
Merged

[win32] refactor Image::init with ImageData #1906

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
} else {
ImageData mask = source.getTransparencyMask();
long [] result = Image.init(this.device, null, source, mask, null); // Since the image is null, the device zoom can be null
long [] result = Image.initIcon(this.device, source, mask);
hBitmap = result[0];
hMask = result[1];
}
Expand Down
79 changes: 48 additions & 31 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 @@ -408,7 +408,7 @@ public Image(Device device, ImageData source, ImageData mask) {
source = DPIUtil.autoScaleUp(device, source);
mask = DPIUtil.autoScaleUp(device, mask);
mask = ImageData.convertMask(mask);
init(this.device, this, source, mask, getZoom());
initIconHandle(this.device, source, mask, getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
}
Expand Down Expand Up @@ -777,7 +777,7 @@ private ImageHandle getImageMetadata(int zoom) {
// to image data without transparency mask, this will create invalid images
// so this fallback will "repair" the image data by explicitly passing
// the transparency mask created from the scaled image data
init(this.device, this, newData, newData.getTransparencyMask(), zoom);
initIconHandle(this.device, newData, newData.getTransparencyMask(), zoom);
} else {
init(newData, zoom);
}
Expand Down Expand Up @@ -1542,7 +1542,9 @@ static ImageData directToDirect(ImageData src, int newDepth, PaletteData newPale
return img;
}

static long [] init(Device device, Image image, ImageData i, Integer zoom) {
private record HandleForImageDataContainer(int type, ImageData imageData, long[] handles) {}

private static HandleForImageDataContainer init(Device device, ImageData i) {
/* Windows does not support 2-bit images. Convert to 4-bit image. */
if (i.depth == 2) {
i = indexToIndex(i, 4);
Expand Down Expand Up @@ -1708,7 +1710,6 @@ else if (i.alphaData != null) {
}
OS.MoveMemory(pBits[0], data, data.length);

long [] result = null;
if (i.getTransparencyType() == SWT.TRANSPARENCY_MASK) {
/* Get the HDC for the device */
long hDC = device.internal_new_GC(null);
Expand All @@ -1735,31 +1736,10 @@ else if (i.alphaData != null) {
OS.DeleteDC(hdcDest);
OS.DeleteObject(hDib);

if (image == null) {
result = new long []{hBitmap, hMask};
} else {
/* Create the icon */
ICONINFO info = new ICONINFO();
info.fIcon = true;
info.hbmColor = hBitmap;
info.hbmMask = hMask;
long hIcon = OS.CreateIconIndirect(info);
if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.DeleteObject(hBitmap);
OS.DeleteObject(hMask);
image.type = SWT.ICON;
image.new ImageHandle(hIcon, zoom);
}
return new HandleForImageDataContainer(SWT.ICON, i, new long []{hBitmap, hMask});
} else {
if (image == null) {
result = new long []{hDib};
} else {
image.type = SWT.BITMAP;
image.transparentPixel = i.transparentPixel;
image.new ImageHandle(hDib, zoom);
}
return new HandleForImageDataContainer(SWT.BITMAP, i, new long []{hDib});
}
return result;
}

private void setImageMetadataForHandle(ImageHandle imageMetadata, Integer zoom) {
Expand All @@ -1771,9 +1751,35 @@ private void setImageMetadataForHandle(ImageHandle imageMetadata, Integer zoom)
zoomLevelToImageHandle.put(zoom, imageMetadata);
}

static long [] init(Device device, Image image, ImageData source, ImageData mask, Integer zoom) {
private ImageHandle initIconHandle(Device device, ImageData source, ImageData mask, Integer zoom) {
ImageData imageData = applyMask(source, mask);
HandleForImageDataContainer imageDataHandle = init(device, imageData);
return initIconHandle(imageDataHandle.handles, zoom);
}

private ImageHandle initIconHandle(long[] handles, int zoom) {
/* Create the icon */
ICONINFO info = new ICONINFO();
info.fIcon = true;
info.hbmColor = handles[0];
info.hbmMask = handles[1];
long hIcon = OS.CreateIconIndirect(info);
if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.DeleteObject(handles[0]);
OS.DeleteObject(handles[1]);
type = SWT.ICON;
return new ImageHandle(hIcon, zoom);
}

private ImageHandle initBitmapHandle(ImageData imageData, long handle, Integer zoom) {
type = SWT.BITMAP;
transparentPixel = imageData.transparentPixel;
return new ImageHandle(handle, zoom);
}

static long [] initIcon(Device device, ImageData source, ImageData mask) {
ImageData imageData = applyMask(source, mask);
return init(device, image, imageData, zoom);
return init(device, imageData).handles;
}

private static ImageData applyMask(ImageData source, ImageData mask) {
Expand Down Expand Up @@ -1851,9 +1857,20 @@ private static ImageData applyMask(ImageData source, ImageData mask) {
}


void init(ImageData i, Integer zoom) {
private ImageHandle init(ImageData i, int zoom) {
if (i == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
init(device, this, i, zoom);
HandleForImageDataContainer imageDataHandle = init(device, i);
switch (imageDataHandle.type()) {
case SWT.ICON: {
return initIconHandle(imageDataHandle.handles(), zoom);
}
case SWT.BITMAP: {
return initBitmapHandle(imageDataHandle.imageData(), imageDataHandle.handles()[0], zoom);
}
default:
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
return null;
}
}

/**
Expand Down
Loading