Skip to content

[macOS] Consider transformation scale in GC.drawImage(image, x, y) #2919 #3246

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
HeikoKlare merged 1 commit into from
Apr 27, 2026
+23 −5
Merged

[macOS] Consider transformation scale in GC.drawImage(image, x, y) #2919 #3246

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
25 changes: 23 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,19 @@ static int checkStyle (int style) {
return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
}

private float calculateTransformationScale() {
if (data.transform == null) {
return 1.0f;
}
// this calculates the effective length in x and y
// direction without being affected by the rotation
// of the transformation
NSAffineTransformStruct struct = data.transform.transformStruct();
float scaleWidth = (float) Math.hypot(struct.m11, struct.m21);
float scaleHeight = (float) Math.hypot(struct.m12, struct.m22);
return Math.max(scaleWidth, scaleHeight);
}

/**
* Invokes platform specific functionality to allocate a new graphics context.
* <p>
Expand Down Expand Up @@ -1143,7 +1156,12 @@ public void drawImage(Image image, int x, int y) {
if (handle == null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
drawImage(image, 0, 0, -1, -1, x, y, -1, -1, true);
if (data.transform != null) {
Rectangle imageBounds = image.getBounds();
drawImage(image, x, y, imageBounds.width, imageBounds.height);
} else {
drawImage(image, 0, 0, -1, -1, x, y, -1, -1, true);
}
}

/**
Expand Down Expand Up @@ -1238,9 +1256,12 @@ public void drawImage(Image image, int destX, int destY, int destWidth, int dest
if (image.isDisposed()) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
float transformationScale = calculateTransformationScale();
int scaledWidth = Math.round(destWidth * transformationScale);
int scaledHeight = Math.round(destHeight * transformationScale);
image.executeOnImageAtSizeBestFittingSize(imageAtSize -> {
drawImage(imageAtSize, 0, 0, imageAtSize.width, imageAtSize.height, destX, destY, destWidth, destHeight, false);
}, destWidth, destHeight);
}, scaledWidth, scaledHeight);
}

void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple) {
Expand Down
3 changes: 0 additions & 3 deletions ...e.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

Expand Down Expand Up @@ -395,7 +393,6 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageIIII() {
}

@Test
@DisabledOnOs(OS.MAC)
public void test_drawImageLorg_eclipse_swt_graphics_ImageIIII_withTransform() throws IOException {
Image image = null;
try (InputStream is = getClass().getResourceAsStream("collapseall.svg")) {
Expand Down
Loading