Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/ControlWin32Tests.java

@@ -100,11 +100,11 @@ public void testCorrectScaleUpUsingDifferentSetBoundsMethod() {
 
 		button.setBounds(new Rectangle(0, 47, 200, 47));
 		assertEquals("Control::setBounds(Rectangle) doesn't scale up correctly",
-				new Rectangle(0, 82, 350, 82), button.getBoundsInPixels());
+				new Rectangle(0, 82, 350, 83), button.getBoundsInPixels());
 
 		button.setBounds(0, 47, 200, 47);
 		assertEquals("Control::setBounds(int, int, int, int) doesn't scale up correctly",
-				new Rectangle(0, 82, 350, 82), button.getBoundsInPixels());
+				new Rectangle(0, 82, 350, 83), button.getBoundsInPixels());
 	}
 
 	record FontComparison(int originalFontHeight, int currentFontHeight) {

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java

@@ -1353,7 +1353,7 @@ public ImageData getImageData() {
  *             multiple monitors with different DPIs, hence deprecated. Use
  *             {@link #getImageData(int)} instead.
  */
-@Deprecated
+@Deprecated(since = "2025-09", forRemoval = true)
 public ImageData getImageDataAtCurrentZoom() {
 	return getImageData(DPIUtil.getDeviceZoom());
 }

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

@@ -1064,7 +1064,7 @@ public ImageData getImageData () {
  *             multiple monitors with different DPIs, hence deprecated. Use
  *             {@link #getImageData(int)} instead.
  */
-@Deprecated
+@Deprecated(since = "2025-09", forRemoval = true)
 public ImageData getImageDataAtCurrentZoom () {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 

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

@@ -1243,7 +1243,7 @@ public ImageData getImageData (int zoom) {
  *             multiple monitors with different DPIs, hence deprecated. Use
  *             {@link #getImageData(int)} instead.
  */
-@Deprecated
+@Deprecated(since = "2025-09", forRemoval = true)
 public ImageData getImageDataAtCurrentZoom() {
 	return applyUsingAnyHandle(ImageHandle::getImageData);
 }

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/Win32DPIUtils.java

@@ -108,6 +108,20 @@ public static Point pixelToPoint(Drawable drawable, Point point, int zoom) {
 	}
 
 	public static Rectangle pixelToPoint(Rectangle rect, int zoom) {
+		if (zoom == 100 || rect == null) return rect;
+		if (rect instanceof Rectangle.OfFloat rectOfFloat) return pixelToPoint(rectOfFloat, zoom);
+		Rectangle scaledRect = new Rectangle.OfFloat (0,0,0,0);
+		Point scaledTopLeft = pixelToPoint(new Point (rect.x, rect.y), zoom);
+		Point scaledBottomRight = pixelToPoint(new Point (rect.x + rect.width, rect.y + rect.height), zoom);
+
+		scaledRect.x = scaledTopLeft.x;
+		scaledRect.y = scaledTopLeft.y;
+		scaledRect.width = scaledBottomRight.x - scaledTopLeft.x;
+		scaledRect.height = scaledBottomRight.y - scaledTopLeft.y;
+		return scaledRect;
+	}
+
+	private static Rectangle pixelToPoint(Rectangle.OfFloat rect, int zoom) {
 		return scaleBounds(rect, 100, zoom);
 	}
 
@@ -120,6 +134,21 @@ public static Rectangle pixelToPoint(Drawable drawable, Rectangle rect, int zoom
 	 * Returns a new rectangle as per the scaleFactor.
 	 */
 	public static Rectangle scaleBounds (Rectangle rect, int targetZoom, int currentZoom) {
+		if (rect == null || targetZoom == currentZoom) return rect;
+		if (rect instanceof Rectangle.OfFloat rectOfFloat) return scaleBounds(rectOfFloat, targetZoom, currentZoom);
+		float scaleFactor = ((float)targetZoom) / (float)currentZoom;
+		Rectangle returnRect = new Rectangle.OfFloat (0,0,0,0);
+		returnRect.x = Math.round (rect.x * scaleFactor);
+		returnRect.y = Math.round (rect.y * scaleFactor);
+		returnRect.width = Math.round (rect.width * scaleFactor);
+		returnRect.height = Math.round (rect.height * scaleFactor);
+		return returnRect;
+	}
+
+	/**
+	 * Returns a new rectangle as per the scaleFactor.
+	 */
+	private static Rectangle scaleBounds (Rectangle.OfFloat rect, int targetZoom, int currentZoom) {
 		if (rect == null || targetZoom == currentZoom) return rect;
 		Rectangle.OfFloat fRect = FloatAwareGeometryFactory.createFrom(rect);
 		float scaleFactor = DPIUtil.getScalingFactor(targetZoom, currentZoom);
@@ -185,6 +214,20 @@ public static Point pointToPixel(Drawable drawable, Point point, int zoom) {
 	}
 
 	public static Rectangle pointToPixel(Rectangle rect, int zoom) {
+		if (zoom == 100 || rect == null) return rect;
+		if (rect instanceof Rectangle.OfFloat rectOfFloat) return pointToPixel(rectOfFloat, zoom);
+		Rectangle scaledRect = new Rectangle.OfFloat(0,0,0,0);
+		Point scaledTopLeft = pointToPixel (new Point(rect.x, rect.y), zoom);
+		Point scaledBottomRight = pointToPixel (new Point(rect.x + rect.width, rect.y + rect.height), zoom);
+
+		scaledRect.x = scaledTopLeft.x;
+		scaledRect.y = scaledTopLeft.y;
+		scaledRect.width = scaledBottomRight.x - scaledTopLeft.x;
+		scaledRect.height = scaledBottomRight.y - scaledTopLeft.y;
+		return scaledRect;
+	}
+
+	private static Rectangle pointToPixel(Rectangle.OfFloat rect, int zoom) {
 		return scaleBounds(rect, zoom, 100);
 	}
 

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java

@@ -7188,23 +7188,21 @@ private LRESULT positionTooltip(NMHDR hdr, long lParam) {
 		if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
 		long hFont = item.fontHandle (pinfo.iSubItem);
 		if (hFont != -1) hFont = OS.SelectObject (hDC, hFont);
-		Event event = sendMeasureItemEvent (item, pinfo.iItem, pinfo.iSubItem, hDC);
-		if (!isDisposed () && !item.isDisposed ()) {
-			RECT itemRect = new RECT ();
-			Rectangle boundsInPixels = Win32DPIUtils.pointToPixel(event.getBounds(), getZoom());
-			OS.SetRect (itemRect, boundsInPixels.x, boundsInPixels.y, boundsInPixels.x + boundsInPixels.width, boundsInPixels.y + boundsInPixels.height);
+		if (!isDisposed() && !item.isDisposed()) {
 			if (hdr.code == OS.TTN_SHOW) {
-				RECT toolRect = isCustomToolTip() ? toolTipRect (itemRect) : itemRect;
-				OS.MapWindowPoints (handle, 0, toolRect, 2);
-				long hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+				RECT itemRect = getItemBounds(pinfo, item, hDC);
+				RECT toolRect = isCustomToolTip() ? toolTipRect(itemRect) : itemRect;
+				OS.MapWindowPoints(handle, 0, toolRect, 2);
+				long hwndToolTip = OS.SendMessage(handle, OS.LVM_GETTOOLTIPS, 0, 0);
 				int flags = OS.SWP_NOACTIVATE | OS.SWP_NOZORDER;
 				Rectangle adjustedTooltipBounds = getDisplay().fitRectangleBoundsIntoMonitorWithCursor(toolRect);
 				OS.SetWindowPos(hwndToolTip, 0, adjustedTooltipBounds.x, adjustedTooltipBounds.y,
 						adjustedTooltipBounds.width, adjustedTooltipBounds.height, flags);
 				result = LRESULT.ONE;
 			} else if (isCustomToolTip()) {
-				NMTTDISPINFO lpnmtdi = new NMTTDISPINFO ();
-				OS.MoveMemory (lpnmtdi, lParam, NMTTDISPINFO.sizeof);
+				RECT itemRect = getItemBounds(pinfo, item, hDC);
+				NMTTDISPINFO lpnmtdi = new NMTTDISPINFO();
+				OS.MoveMemory(lpnmtdi, lParam, NMTTDISPINFO.sizeof);
 				if (lpnmtdi.lpszText != 0) {
 					OS.MoveMemory (lpnmtdi.lpszText, new char [1], 2);
 					OS.MoveMemory (lParam, lpnmtdi, NMTTDISPINFO.sizeof);
@@ -7231,6 +7229,15 @@ private LRESULT positionTooltip(NMHDR hdr, long lParam) {
 	return result;
 }
 
+private RECT getItemBounds(LVHITTESTINFO pinfo, TableItem item, long hDC) {
+	Event event = sendMeasureItemEvent(item, pinfo.iItem, pinfo.iSubItem, hDC);
+	RECT itemRect = new RECT();
+	Rectangle boundsInPixels = Win32DPIUtils.pointToPixel(event.getBounds(), getZoom());
+	OS.SetRect(itemRect, boundsInPixels.x, boundsInPixels.y, boundsInPixels.x + boundsInPixels.width,
+			boundsInPixels.y + boundsInPixels.height);
+	return itemRect;
+}
+
 LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) {
 	switch (nmcd.dwDrawStage) {
 		case OS.CDDS_PREPAINT: {

tests/org.eclipse.swt.tests.win32/JUnit Tests/org/eclipse/swt/tests/win32/Win32DPIUtilTests.java

@@ -202,7 +202,7 @@ public void scaleUpPoint() {
 	@Test
 	public void scaleUpRectangle() {
 		Rectangle valueAt200 = new Rectangle(100, 150, 10, 14);
-		Rectangle valueAt150 = new Rectangle(75, 113, 8, 11);
+		Rectangle valueAt150 = new Rectangle(75, 113, 8, 10);
 		Rectangle valueAt100 = new Rectangle(50, 75, 5, 7);
 
 		Rectangle scaledValue = Win32DPIUtils.pointToPixel(valueAt100, 200);
@@ -225,7 +225,7 @@ public void scaleDownscaleUpRectangleInvertible() {
 		for (int zoom1 : zooms) {
 			for (int zoom2 : zooms) {
 				for (int i = 1; i <= 10000; i++) {
-					Rectangle rect = new Rectangle(0, 0, i, i);
+					Rectangle rect = new Rectangle.OfFloat(0, 0, i, i);
 					Rectangle scaleDown = Win32DPIUtils.pixelToPoint(rect, zoom1);
 					Rectangle scaleUp = Win32DPIUtils.pointToPixel(scaleDown, zoom2);
 					scaleDown = Win32DPIUtils.pixelToPoint(scaleUp, zoom2);

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java

@@ -634,7 +634,7 @@ public void test_getBoundsInPixels() {
 	assertEquals("Image.getBoundsInPixels method doesn't return bounds in Pixel values for ImageGcDrawer.", initialBounds, boundsInPixels);
 }
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 @Test
 public void test_getImageDataCurrentZoom() {
 	Rectangle bounds = new Rectangle(0, 0, 10, 20);