Skip to content

Commit 804f78d

Browse files
committed
Fix GC#drawImage + ImageGcDrawer for Cropping and Scaling
The GC#drawImage method takes (image, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight) as arguments and crops and scales from the source region to the destination region. Passing an image drawn via ImageGCDrawer led to the following issue: The image handle from the subcall is resolved using the monitor zoom (data.nativeZoom) and the calculated scaledImageZoom (gcZoom * scaleFactor). This handle corresponds to an ImageData initialized at scaledImageZoom, whereas the drawings of the second GC are performed using the monitor zoom, subject to the auto-scale property. This mismatch results in unaligned sizing of drawings. For example, a 200% monitor zoom combined with a scale factor of 0.5 produces a scaledImageZoom of 100%. As a result, the ImageData is initialized at 100%, while drawing occurs at 200%. This exact case is demonstrated in vi-eclipse/Eclipse-Platform#554 . Furthermore, the calculation of scaledImageZoom uses fallback logic that only allows 100% and 200% as possible outcomes, which is clearly unintended in this context. The fix delegates resolving the correct handle to the Image class by passing the width/height of the full image scaled by the scaledImageZoom. This is a space on where scaled src coordinates/width/height lie. A callback then creates a new handle for the height/width and respects the auto-scale property. If the returned handle matches the full image scaled to the requested scaledImageZoom in width and height, the source region coordinates/width/height are passed directly in pixels at that zoom. Otherwise, the internal zoom factor is derived from the returned handle’s width relative to the full image, and the source region coordinates are converted to pixel values using this internal zoom.
1 parent f005865 commit 804f78d

File tree

1 file changed

+22
-34
lines changed
  • bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics

1 file changed

+22
-34
lines changed

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515

1616

1717
import java.util.*;
18-
import java.util.List;
1918
import java.util.function.*;
20-
import java.util.stream.*;
2119

2220
import org.eclipse.swt.*;
2321
import org.eclipse.swt.graphics.Image.*;
2422
import org.eclipse.swt.internal.*;
2523
import org.eclipse.swt.internal.gdip.*;
2624
import org.eclipse.swt.internal.win32.*;
27-
import org.eclipse.swt.widgets.*;
2825

2926
/**
3027
* Class <code>GC</code> is where all of the drawing capabilities that are
@@ -1183,15 +1180,6 @@ void apply() {
11831180
drawImage(getImage(), source.x, source.y, source.width, source.height, destination.x, destination.y, destination.width, destination.height, gcZoom, srcImageZoom);
11841181
}
11851182

1186-
private Collection<Integer> getAllCurrentMonitorZooms() {
1187-
if (device instanceof Display display) {
1188-
return Arrays.stream(display.getMonitors())
1189-
.map(Monitor::getZoom)
1190-
.collect(Collectors.toSet());
1191-
}
1192-
return Collections.emptySet();
1193-
}
1194-
11951183
private int calculateZoomForImage(int gcZoom, int srcWidth, int srcHeight, int destWidth, int destHeight) {
11961184
if (srcWidth == 1 && srcHeight == 1) {
11971185
// One pixel images can use the GC zoom
@@ -1207,13 +1195,7 @@ private int calculateZoomForImage(int gcZoom, int srcWidth, int srcHeight, int d
12071195

12081196
float imageScaleFactor = 1f * destWidth / srcWidth;
12091197
int imageZoom = Math.round(gcZoom * imageScaleFactor);
1210-
if (getAllCurrentMonitorZooms().contains(imageZoom)) {
1211-
return imageZoom;
1212-
}
1213-
if (imageZoom > 150) {
1214-
return 200;
1215-
}
1216-
return 100;
1198+
return imageZoom;
12171199
}
12181200
}
12191201

@@ -1245,24 +1227,30 @@ private void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHei
12451227
int destWidth, int destHeight, int imageZoom, int scaledImageZoom) {
12461228
Rectangle src = Win32DPIUtils.pointToPixel(drawable, new Rectangle(srcX, srcY, srcWidth, srcHeight), scaledImageZoom);
12471229
Rectangle dest = Win32DPIUtils.pointToPixel(drawable, new Rectangle(destX, destY, destWidth, destHeight), imageZoom);
1248-
if (scaledImageZoom != 100) {
1230+
Rectangle fullImageBounds = image.getBounds();
1231+
Rectangle targetSrc = Win32DPIUtils.pointToPixel(drawable, fullImageBounds, scaledImageZoom);
1232+
Rectangle startSrc = new Rectangle(srcX, srcY, srcWidth, srcHeight);
1233+
image.executeOnImageHandleAtBestFittingSize((tempHandle) -> {
1234+
Rectangle src1 = computeSourceRectangle(tempHandle, fullImageBounds, targetSrc, startSrc, src);
1235+
drawImage(image, src1.x, src1.y, src1.width, src1.height, dest.x, dest.y, dest.width,
1236+
dest.height, false, tempHandle);
1237+
}, targetSrc.width, targetSrc.height);
1238+
}
1239+
1240+
private Rectangle computeSourceRectangle(ImageHandle imageHandle, Rectangle fullImageBounds, Rectangle targetSrc, Rectangle startSrc, Rectangle srcPart) {
1241+
if (new Rectangle(0, 0, imageHandle.getWidth(), imageHandle.getHeight()).equals(targetSrc)) {
1242+
return srcPart;
1243+
} else {
12491244
/*
1250-
* This is a HACK! Due to rounding errors at fractional scale factors,
1251-
* the coordinates may be slightly off. The workaround is to restrict
1252-
* coordinates to the allowed bounds.
1245+
* the achieved handle with its drawings has not the required size, thus we calculate the zoom of the handle
1246+
*
1247+
* with respect to the full 100% image. The point values (x,y,width,height) of the source "part" of the full image will
1248+
* be computed to pixels by this zoom.
12531249
*/
1254-
Rectangle b = image.getBounds(scaledImageZoom);
1255-
int errX = src.x + src.width - b.width;
1256-
int errY = src.y + src.height - b.height;
1257-
if (errX != 0 || errY != 0) {
1258-
if (errX <= scaledImageZoom / 100 && errY <= scaledImageZoom / 100) {
1259-
src.intersect(b);
1260-
} else {
1261-
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
1262-
}
1263-
}
1250+
float scaleFactor = 1f * imageHandle.getWidth() / fullImageBounds.width;
1251+
int closestZoomOfHandle = Math.round(scaleFactor * 100);
1252+
return Win32DPIUtils.pointToPixel(drawable, startSrc, closestZoomOfHandle);
12641253
}
1265-
drawImage(image, src.x, src.y, src.width, src.height, dest.x, dest.y, dest.width, dest.height, false, image.getHandle(scaledImageZoom, data.nativeZoom));
12661254
}
12671255

12681256
private class DrawImageToImageOperation extends ImageOperation {

0 commit comments

Comments
 (0)