Skip to content

MenuItem Image Scaling with DPI aware metrics #62 #1914

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

MenuItem Image Scaling with DPI aware metrics #62 #1914

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
1 change: 1 addition & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,7 @@ public class OS extends C {
public static final int SM_CYFOCUSBORDER = 84;
public static final int SM_CYHSCROLL = 0x3;
public static final int SM_CYMENU = 0xf;
public static final int SM_CYMENUCHECK = 72;
public static final int SM_CXMINTRACK = 34;
public static final int SM_CYMINTRACK = 35;
public static final int SM_CXMAXTRACK = 59;
Expand Down
49 changes: 47 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,7 @@ public void setImage (Image image) {
info.hbmpItem = OS.HBMMENU_CALLBACK;
} else {
if (OS.IsAppThemed ()) {
if (hBitmap != 0) OS.DeleteObject (hBitmap);
info.hbmpItem = hBitmap = image != null ? Display.create32bitDIB (image, getZoom()) : 0;
info.hbmpItem = hBitmap = getMenuItemIconBitmapHandle(image);
} else {
info.hbmpItem = image != null ? OS.HBMMENU_CALLBACK : 0;
}
Expand All @@ -792,6 +791,52 @@ public void setImage (Image image) {
parent.redraw ();
}

private long getMenuItemIconBitmapHandle(Image image) {
if (image == null) {
return 0;
}
if (hBitmap != 0) OS.DeleteObject (hBitmap);
int zoom = adaptZoomForMenuItem(getZoom());
return Display.create32bitDIB (image, zoom);
}

private int adaptZoomForMenuItem(int currentZoom) {
int primaryMonitorZoomAtAppStartUp = getPrimaryMonitorZoomAtStartup();
/*
* Windows has inconsistent behavior when setting the size of MenuItem image and
* hence we need to adjust the size of the images as per different kind of zoom
* level, i.e. full (100s), half (50s) and quarter (25s). The image size per
* zoom level is also affected by the primaryMonitorZoomAtAppStartUp. The
* implementation below is based on the pattern observed for all the zoom values
* and what fits the best for these zoom level types.
*/
if (primaryMonitorZoomAtAppStartUp > currentZoom && isQuarterZoom(currentZoom)) {
return currentZoom - 25;
}
if (!isHalfZoom(primaryMonitorZoomAtAppStartUp) && isHalfZoom(currentZoom)) {
// Use the size recommended by System Metrics. This value only holds
// for this case and does not work consistently for other cases.
double expectedSize = getSystemMetrics(OS.SM_CYMENUCHECK);
return (int) ((expectedSize / image.getBounds().height) * 100);
}
return currentZoom;
}

private static boolean isHalfZoom(int zoom) {
return zoom % 50 == 0 && zoom % 100 != 0;
}

private static boolean isQuarterZoom(int zoom) {
return zoom % 10 != 0 && zoom % 25 == 0;
}

private static int getPrimaryMonitorZoomAtStartup() {
long hDC = OS.GetDC(0);
int dpi = OS.GetDeviceCaps(hDC, OS.LOGPIXELSX);
OS.ReleaseDC(0, hDC);
return DPIUtil.mapDPIToZoom(dpi);
}

/**
* Sets the receiver's pull down menu to the argument.
* Only <code>CASCADE</code> menu items can have a
Expand Down
Loading