Skip to content

MenuItem Image Half Scaling to make sure there's no adverse effect #1872

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

Closed
wants to merge 1 commit into from
Closed

MenuItem Image Half Scaling to make sure there's no adverse effect #1872

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 @@ -1246,6 +1246,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
18 changes: 17 additions & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ private static ImageData autoScaleImageData (Device device, final ImageData imag
int height = imageData.height;
int scaledWidth = Math.round (width * scaleFactor);
int scaledHeight = Math.round (height * scaleFactor);
boolean useSmoothScaling = autoScaleMethod == AutoScaleMethod.SMOOTH && imageData.getTransparencyType() != SWT.TRANSPARENCY_MASK;
boolean useSmoothScaling = isSmoothScalingEnabled() && imageData.getTransparencyType() != SWT.TRANSPARENCY_MASK;
if (useSmoothScaling) {
Image original = new Image (device, (ImageDataProvider) zoom -> imageData);
/* Create a 24 bit image data with alpha channel */
Expand All @@ -316,6 +316,10 @@ private static ImageData autoScaleImageData (Device device, final ImageData imag
}
}

public static boolean isSmoothScalingEnabled() {
return autoScaleMethod == AutoScaleMethod.SMOOTH;
}

/**
* Returns a new rectangle as per the scaleFactor.
*/
Expand Down Expand Up @@ -631,7 +635,19 @@ public static boolean useCairoAutoScale() {
return useCairoAutoScale;
}

public static int getZoomForMenuItemImage(int nativeDeviceZoom) {
String autoScaleValueForMenuItemImage = DPIUtil.autoScaleValue;
if(autoScaleValueForMenuItemImage.equals("quarter") || autoScaleValueForMenuItemImage.equals("exact")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this can be specified by the user, you should either use equalsIgnoreCase(...) or transform it using toLowerCase() like it is done in other places

autoScaleValueForMenuItemImage = "half";
}
return getZoomForAutoscaleProperty(nativeDeviceZoom, autoScaleValueForMenuItemImage);
}

public static int getZoomForAutoscaleProperty (int nativeDeviceZoom) {
return getZoomForAutoscaleProperty(nativeDeviceZoom, autoScaleValue);
}

private static int getZoomForAutoscaleProperty (int nativeDeviceZoom, String autoScaleValue) {
int zoom = 0;
if (autoScaleValue != null) {
if ("false".equalsIgnoreCase (autoScaleValue)) {
Expand Down
61 changes: 49 additions & 12 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 @@ -22,6 +22,7 @@
import org.eclipse.swt.internal.DPIUtil.*;
import org.eclipse.swt.internal.gdip.*;
import org.eclipse.swt.internal.win32.*;
import org.eclipse.swt.widgets.*;

/**
* Instances of this class are graphics which have been prepared
Expand Down Expand Up @@ -363,7 +364,7 @@ public Image(Device device, ImageData data) {
super(device);
if (data == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(data, 100));
data = scaleImageData(device, 100, getZoom(), data);
init(data, getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
Expand Down Expand Up @@ -407,8 +408,8 @@ public Image(Device device, ImageData source, ImageData mask) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
source = DPIUtil.autoScaleUp(device, source);
mask = DPIUtil.autoScaleUp(device, mask);
source = scaleImageData(device, 100, getZoom(), source);
mask = scaleImageData(device, 100, getZoom(), mask);
mask = ImageData.convertMask(mask);
init(this.device, this, source, mask, getZoom());
init();
Expand Down Expand Up @@ -471,7 +472,7 @@ public Image(Device device, ImageData source, ImageData mask) {
public Image (Device device, InputStream stream) {
super(device);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (stream), 100));
ImageData data = scaleImageData(device, 100, getZoom(), new ImageData (stream));
init(data, getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
Expand Down Expand Up @@ -513,7 +514,7 @@ public Image (Device device, String filename) {
super(device);
if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
ImageData data = DPIUtil.autoScaleUp(device, new ElementAtZoom<>(new ImageData (filename), 100));
ImageData data = scaleImageData(device, 100, getZoom(), new ImageData (filename));
init(data, getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
Expand Down Expand Up @@ -559,7 +560,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
init(new ImageData (fileName.element()), getZoom());
}
} else {
ImageData resizedData = DPIUtil.autoScaleImageData (device, new ImageData (fileName.element()), fileName.zoom());
ImageData resizedData = scaleImageData(device, fileName.zoom(), getZoom(), new ImageData (fileName.element()));
init(resizedData, getZoom());
}
init();
Expand Down Expand Up @@ -600,7 +601,7 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
initialNativeZoom = DPIUtil.getNativeDeviceZoom();
ElementAtZoom<ImageData> data = DPIUtil.validateAndGetImageDataAtZoom(imageDataProvider, getZoom());
ImageData resizedData = DPIUtil.scaleImageData(device, data.element(), getZoom(), data.zoom());
ImageData resizedData = scaleImageData(device, data.zoom(), getZoom(), data.element());
init (resizedData, getZoom());
init();
this.device.registerResourceWithZoomSupport(this);
Expand Down Expand Up @@ -1420,7 +1421,7 @@ public ImageData getImageData (int zoom) {
}
TreeSet<Integer> availableZooms = new TreeSet<>(zoomLevelToImageHandle.keySet());
int closestZoom = Optional.ofNullable(availableZooms.higher(zoom)).orElse(availableZooms.lower(zoom));
return DPIUtil.scaleImageData (device, getImageMetadata(closestZoom).getImageData(), zoom, closestZoom);
return scaleImageData(device, closestZoom, zoom, getImageMetadata(closestZoom).getImageData());
}

/**
Expand Down Expand Up @@ -2048,6 +2049,41 @@ private void setBackground(Color color, long handle) {
device.internal_dispose_GC(hDC, null);
}

private ImageData scaleImageData(Device device, int currentZoom, int targetZoom, ImageData imageData) {
if (imageData == null || targetZoom == currentZoom || (device != null && !device.isAutoScalable())) return imageData;
float scaleFactor = (float) targetZoom / (float) currentZoom;
int width = imageData.width;
int height = imageData.height;
int scaledWidth = Math.round (width * scaleFactor);
int scaledHeight = Math.round (height * scaleFactor);
boolean useSmoothScaling = DPIUtil.isSmoothScalingEnabled() && imageData.getTransparencyType() != SWT.TRANSPARENCY_MASK;
if (useSmoothScaling) {
return scaleToUsingSmoothScaling(scaledWidth, scaledHeight, imageData);
} else {
return imageData.scaledTo (scaledWidth, scaledHeight);
}
}

private ImageData scaleToUsingSmoothScaling(int width, int height, ImageData imageData) {
Image original = new Image (Display.getCurrent(), (ImageDataProvider) zoom -> imageData);
/* Create a 24 bit image data with alpha channel */
final ImageData resultData = new ImageData (width, height, 24, new PaletteData (0xFF, 0xFF00, 0xFF0000));
resultData.alphaData = new byte [width * height];
Image resultImage = new Image (Display.getCurrent(), (ImageDataProvider) zoom -> resultData);
GC gc = new GC (resultImage);
gc.setAntialias (SWT.ON);
gc.drawImage (original, 0, 0, imageData.width, imageData.height,
/* E.g. destWidth here is effectively DPIUtil.autoScaleDown (scaledWidth), but avoiding rounding errors.
* Nevertheless, we still have some rounding errors due to the point-based API GC#drawImage(..).
*/
0, 0, width, height, false);
gc.dispose ();
original.dispose ();
ImageData result = resultImage.getImageData (resultImage.getZoom());
resultImage.dispose ();
return result;
}

private int getZoom() {
return DPIUtil.getZoomForAutoscaleProperty(initialNativeZoom);
}
Expand Down Expand Up @@ -2138,7 +2174,8 @@ protected Rectangle getBounds(int zoom) {
@Override
ImageData getImageData(int zoom) {
ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom (provider, zoom);
return DPIUtil.scaleImageData (device, new ImageData (fileName.element()), zoom, fileName.zoom());
ImageData imageData = new ImageData (fileName.element());
return scaleImageData(device, fileName.zoom(), zoom, imageData);
}

@Override
Expand All @@ -2151,7 +2188,7 @@ ImageHandle getImageMetadata(int zoom) {
if (imageMetadata == null) init(imageData, zoom);
init();
} else {
ImageData resizedData = DPIUtil.scaleImageData(device, imageData, zoom, imageCandidate.zoom());
ImageData resizedData = scaleImageData(device, imageCandidate.zoom(), zoom, imageData);
ImageData newData = adaptImageDataIfDisabledOrGray(resizedData);
init(newData, zoom);
}
Expand Down Expand Up @@ -2201,13 +2238,13 @@ protected Rectangle getBounds(int zoom) {
@Override
ImageData getImageData(int zoom) {
ElementAtZoom<ImageData> data = DPIUtil.validateAndGetImageDataAtZoom (provider, zoom);
return DPIUtil.scaleImageData (device, data.element(), zoom, data.zoom());
return scaleImageData(device, data.zoom(), zoom, data.element());
}

@Override
ImageHandle getImageMetadata(int zoom) {
ElementAtZoom<ImageData> imageCandidate = DPIUtil.validateAndGetImageDataAtZoom (provider, zoom);
ImageData resizedData = DPIUtil.scaleImageData (device, imageCandidate.element(), zoom, imageCandidate.zoom());
ImageData resizedData = scaleImageData(device, imageCandidate.zoom(), zoom, imageCandidate.element());
ImageData newData = adaptImageDataIfDisabledOrGray(resizedData);
init(newData, zoom);
init();
Expand Down
13 changes: 11 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,16 @@ public void setImage (Image image) {
parent.redraw ();
}

private long getMenuItemIconBitmapHandle(Image image) {
if(image == null) {
return 0;
}
if (hBitmap != 0) OS.DeleteObject (hBitmap);
int desiredSize = getSystemMetrics(OS.SM_CYMENUCHECK);
int zoom = (int) (((double) desiredSize / image.getBounds().height) * 100);
return Display.create32bitDIB (image, zoom);
}

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