Skip to content

[macOS] Initialize image data from ImageGcDrawer only at device zoom #2236

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
Jun 19, 2025
Merged

[macOS] Initialize image data from ImageGcDrawer only at device zoom #2236

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
27 changes: 10 additions & 17 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public Image(Device device, ImageData data) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
init(data);
init(data, 100);
init();
} finally {
if (pool != null) pool.release();
Expand Down Expand Up @@ -623,7 +623,7 @@ public Image(Device device, ImageData source, ImageData mask) {
ImageData image = new ImageData(source.width, source.height, source.depth, source.palette, source.scanlinePad, source.data);
image.maskPad = mask.scanlinePad;
image.maskData = mask.data;
init(image);
init(image, 100);
} finally {
if (pool != null) pool.release();
}
Expand Down Expand Up @@ -789,7 +789,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
initNative(filename);
if (this.handle == null) init(ImageDataLoader.load(filename, 100, 100).element());
if (this.handle == null) init(ImageDataLoader.load(filename, 100, 100).element(), 100);
init();
String filename2x = imageFileNameProvider.getImagePath(200);
if (filename2x != null) {
Expand Down Expand Up @@ -848,7 +848,7 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
init (data);
init (data, 100);
init ();
ImageData data2x = imageDataProvider.getImageData (200);
if (data2x != null) {
Expand Down Expand Up @@ -886,20 +886,13 @@ public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height)
this.imageGcDrawer = imageGcDrawer;
this.width = width;
this.height = height;
ImageData data = drawWithImageGcDrawer(imageGcDrawer, width, height, 100);
ImageData data = drawWithImageGcDrawer(imageGcDrawer, width, height, DPIUtil.getDeviceZoom());
if (data == null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
init (data);
init (data, DPIUtil.getDeviceZoom());
init ();
ImageData data2x = drawWithImageGcDrawer(imageGcDrawer, width, height, 200);
if (data2x != null) {
alphaInfo_200 = new AlphaInfo();
NSBitmapImageRep rep = createRepresentation (data2x, alphaInfo_200);
handle.addRepresentation(rep);
rep.release();
}
} finally {
if (pool != null) pool.release();
}
Expand Down Expand Up @@ -1474,7 +1467,7 @@ void init(int width, int height) {
if (alphaInfo_100 == null) alphaInfo_100 = new AlphaInfo();
}

void init(ImageData image) {
void init(ImageData image, int imageZoom) {
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

if (handle != null) handle.release();
Expand All @@ -1484,8 +1477,8 @@ void init(ImageData image) {
size.width = width;
size.height = height;
handle = handle.initWithSize(size);
this.width = image.width;
this.height = image.height;
this.width = image.width * 100 / imageZoom;
this.height = image.height * 100 / imageZoom;
if (alphaInfo_100 == null) alphaInfo_100 = new AlphaInfo();
NSBitmapImageRep rep = createRepresentation(image, alphaInfo_100);
handle.addRepresentation(rep);
Expand All @@ -1495,7 +1488,7 @@ void init(ImageData image) {

private void initWithSupplier(Function<Integer, Boolean> canLoadAtZoom, Function<Integer, ImageData> zoomToImageData) {
ImageData imageData = zoomToImageData.apply(100);
init(imageData);
init(imageData, 100);
if (canLoadAtZoom.apply(200)) {
ImageData imageData2x = zoomToImageData.apply(200);
alphaInfo_200 = new AlphaInfo();
Expand Down
30 changes: 30 additions & 0 deletions ...wt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import static org.junit.jupiter.api.Assertions.assertNotEquals;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -1075,6 +1076,34 @@ public void test_imageDataSameViaProviderAndSimpleData() {
dataImage.dispose();
}

/**
* See https://github.com/eclipse-platform/eclipse.platform.ui/issues/3039
*/
@Test
public void test_gcOnImageGcDrawer_imageDataAtNonDeviceZoom() {
int originalDeviceZoom = DPIUtil.getDeviceZoom();
int deviceZoom = 200;
int nonDeviceZoom = 100;
DPIUtil.setDeviceZoom(deviceZoom);

ImageGcDrawer blueDrawer = (gc, width, height) -> {
gc.setBackground(display.getSystemColor(SWT.COLOR_BLUE));
gc.fillRectangle(0, 0, width, height);
};
Image image = new Image(display, blueDrawer, 1, 1);
int bluePixelValue = image.getImageData(nonDeviceZoom).getPixel(0, 0);

GC redOverwritingGc = new GC(image);
try {
redOverwritingGc.setBackground(display.getSystemColor(SWT.COLOR_RED));
redOverwritingGc.fillRectangle(0, 0, 1, 1);
assertNotEquals(bluePixelValue, image.getImageData(nonDeviceZoom).getPixel(0, 0));
} finally {
redOverwritingGc.dispose();
image.dispose();
DPIUtil.setDeviceZoom(originalDeviceZoom);
}
}

private Comparator<ImageData> imageDataComparator() {
return Comparator.<ImageData>comparingInt(d -> d.width) //
Expand All @@ -1095,3 +1124,4 @@ private Comparator<ImageData> imageDataComparator() {
}

}

Loading