[Win32] Revert treating Tree.INSET as point value

Windows seems to use pixel-based insets, such that treating the defined
values as point values and scaling them led to wrong image placements in
trees and eventually cut off checkboxes or overlapped the text.

Author: HeikoKlare

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

@@ -748,7 +748,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) {
 						}
 					}
 				}
-				rect.left += DPIUtil.pointToPixel(INSET - 1, zoom) ;
+				rect.left += INSET - 1;
 				if (drawImage) {
 					Image image = null;
 					if (index == 0) {
@@ -757,8 +757,8 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long wParam, long lParam) {
 						Image [] images  = item.images;
 						if (images != null) image = images [index];
 					}
-					int inset = i != 0 ? DPIUtil.pointToPixel(INSET, zoom) : 0;
-					int offset = i != 0 ? DPIUtil.pointToPixel(INSET, zoom) : DPIUtil.pointToPixel(INSET + 2, zoom);
+					int inset = i != 0 ? INSET : 0;
+					int offset = i != 0 ? INSET : INSET + 2;
 					if (image != null) {
 						Rectangle bounds = image.getBounds (); // Points
 						if (size == null) size = Win32DPIUtils.pixelToPointAsSize (getImageSize (), zoom); // To Points
@@ -5488,7 +5488,7 @@ public void showColumn (TreeColumn column) {
 			SCROLLINFO info = new SCROLLINFO();
 			info.cbSize = SCROLLINFO.sizeof;
 			info.fMask = OS.SIF_POS;
-			info.nPos = Math.max(0, headerRect.left - DPIUtil.pointToPixel(INSET / 2, getZoom()));
+			info.nPos = Math.max(0, headerRect.left - Tree.INSET / 2);
 			OS.SetScrollInfo(hwndParent, OS.SB_HORZ, info, true);
 			setScrollWidth();
 		} else if (scrollBecauseRight) {
@@ -5502,8 +5502,8 @@ public void showColumn (TreeColumn column) {
 			// info.nPos + wideRect = headerRect.left + wideHeader
 			// info.nPos = headerRect.left + wideHeader - wideRect
 			info.nPos = Math.max(0, wideHeader + headerRect.left - wideRect
-					- DPIUtil.pointToPixel(INSET / 2, getZoom()) );
-			info.nPos = Math.min(rect.right - DPIUtil.pointToPixel(INSET / 2, getZoom()), info.nPos);
+					- Tree.INSET / 2);
+			info.nPos = Math.min(rect.right - Tree.INSET / 2, info.nPos);
 
 			OS.SetScrollInfo(hwndParent, OS.SB_HORZ, info, true);
 			setScrollWidth();
@@ -7930,7 +7930,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, long wParam, long lParam) {
 							}
 						}
 
-						int x = rects[i].left + DPIUtil.pointToPixel(INSET + 2, getZoom());
+						int x = rects[i].left + INSET + 2;
 						if (columns[i].image != null) {
 							GCData data = new GCData();
 							data.device = display;
@@ -8248,7 +8248,7 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) {
 							data.background = OS.GetBkColor (nmcd.hdc);
 							data.font = Font.win32_new (display, hFont);
 							GC gc = createNewGC(nmcd.hdc, data);
-							int x = cellRect [0].left + DPIUtil.pointToPixel(INSET, getZoom());
+							int x = cellRect [0].left + INSET;
 							if (index [0] != 0) x -= gridWidth;
 							Image image = item [0].getImage (index [0]);
 							if (image != null || index [0] == 0) {
@@ -8259,11 +8259,11 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long lParam) {
 									Rectangle rect = image.getBounds (); // Points
 									int zoom = getZoom();
 									gc.drawImage (image, rect.x, rect.y, rect.width, rect.height, DPIUtil.pixelToPoint(x, zoom), DPIUtil.pixelToPoint(imageRect.top, zoom), DPIUtil.pixelToPoint(size.x, zoom), DPIUtil.pixelToPoint(size.y, zoom));
-									x += DPIUtil.pointToPixel(INSET, getZoom()) + (index [0] == 0 ? 1 : 0);
+									x += INSET + (index [0] == 0 ? 1 : 0);
 								}
 								x += size.x;
 							} else {
-								x += DPIUtil.pointToPixel(INSET, getZoom());
+								x += INSET;
 							}
 							String string = item [0].getText (index [0]);
 							if (string != null) {

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

@@ -492,7 +492,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText,
 			}
 			if (getText) {
 				if (fullText && clip) {
-					rect.left = rect.right + DPIUtil.pointToPixel(Tree.INSET, getZoom());
+					rect.left = rect.right + Tree.INSET;
 					rect.right = headerRect.right;
 				} else {
 					String string = index == 0 ? text : strings != null ? strings [index] : null;
@@ -513,10 +513,10 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText,
 							OS.ReleaseDC (hwnd, hNewDC);
 						}
 						if (getImage) {
-							rect.right += textRect.right - textRect.left + DPIUtil.pointToPixel(Tree.INSET * 3, getZoom());
+							rect.right += textRect.right - textRect.left + Tree.INSET * 3;
 						} else {
-							rect.left = rect.right + DPIUtil.pointToPixel(Tree.INSET, getZoom());
-							rect.right = rect.left + (textRect.right - textRect.left) + DPIUtil.pointToPixel(Tree.INSET, getZoom());
+							rect.left = rect.right + Tree.INSET;
+							rect.right = rect.left + (textRect.right - textRect.left) + Tree.INSET;
 						}
 					}
 				}
@@ -914,8 +914,9 @@ public Rectangle getTextBounds (int index) {
 Rectangle getTextBoundsInPixels (int index) {
 	if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
 	RECT rect = getBounds (index, true, false, true);
+	if (index == 0) rect.left += Tree.INSET - 1;
 	rect.left = Math.min (rect.left, rect.right);
-	rect.right = rect.right + DPIUtil.pointToPixel(Tree.INSET, getZoom()); // Add INSET margin to avoid truncation of text seen with "Segoe UI" font
+	rect.right = rect.right - Tree.INSET + 1; // Add 1 px margin to avoid truncation of text seen with "Segoe UI" font
 	int width = Math.max (0, rect.right - rect.left);
 	int height = Math.max (0, rect.bottom - rect.top);
 	return new Rectangle (rect.left, rect.top, width, height);