Skip to content

[Win32] Don't Create a mask image when there is no mask #2657

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 23, 2025
Merged

[Win32] Don't Create a mask image when there is no mask #2657

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
57 changes: 32 additions & 25 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,32 +1180,39 @@ static long create32bitDIB (long hBitmap, int alpha, byte [] alphaData, int tran
}

static Image createIcon (Image image, int zoom) {
Device device = image.getDevice ();
Device device = image.getDevice();
ImageData data = image.getImageData(zoom);
if (data.alpha == -1 && data.alphaData == null) {
ImageData mask = data.getTransparencyMask ();
return new Image (device, data, mask);
}
int width = data.width, height = data.height;
long hMask, hBitmap;
long hDC = device.internal_new_GC (null);
long dstHdc = OS.CreateCompatibleDC (hDC), oldDstBitmap;
hBitmap = Display.create32bitDIB (Image.win32_getHandle(image, zoom), data.alpha, data.alphaData, data.transparentPixel);
hMask = OS.CreateBitmap (width, height, 1, 1, null);
oldDstBitmap = OS.SelectObject (dstHdc, hMask);
OS.PatBlt (dstHdc, 0, 0, width, height, OS.BLACKNESS);
OS.SelectObject (dstHdc, oldDstBitmap);
OS.DeleteDC (dstHdc);
device.internal_dispose_GC (hDC, null);
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);
return Image.win32_new (device, SWT.ICON, hIcon, zoom);
switch (data.getTransparencyType()) {
case SWT.TRANSPARENCY_MASK:
case SWT.TRANSPARENCY_PIXEL:
ImageData mask = data.getTransparencyMask();
return new Image(device, data, mask);
case SWT.TRANSPARENCY_ALPHA:
case SWT.NONE:
default:
int width = data.width, height = data.height;
long hMask, hBitmap;
long hDC = device.internal_new_GC(null);
long dstHdc = OS.CreateCompatibleDC(hDC), oldDstBitmap;
hBitmap = Display.create32bitDIB(Image.win32_getHandle(image, zoom), data.alpha, data.alphaData,
data.transparentPixel);
hMask = OS.CreateBitmap(width, height, 1, 1, null);
oldDstBitmap = OS.SelectObject(dstHdc, hMask);
OS.PatBlt(dstHdc, 0, 0, width, height, OS.BLACKNESS);
OS.SelectObject(dstHdc, oldDstBitmap);
OS.DeleteDC(dstHdc);
device.internal_dispose_GC(hDC, null);
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);
return Image.win32_new(device, SWT.ICON, hIcon, zoom);
}
}

long getTextSearchIcon(int size) {
Expand Down
Loading