Remove the additional SORT_WIDTH spacing logic in Tree column rendering.

Since Windows 7, the sort indicator in tree columns is rendered above
the column header text, whereas in Windows XP it was placed next to the
text. The original SWT implementation added extra pixels (SORT_WIDTH) to
the column width to make space for the indicator.

Author: ShahzaibIbrahim

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

@@ -114,7 +114,6 @@ public class Tree extends Composite {
 	static final int TIMER_MAX_COUNT = 8;
 	static final int INSET = 3;
 	static final int GRID_WIDTH = 1;
-	static final int SORT_WIDTH = 10;
 	static final int HEADER_MARGIN = 12;
 	static final int HEADER_EXTRA = 3;
 	static final int INCREMENT = 5;

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

@@ -377,17 +377,9 @@ public void pack () {
 	OS.DrawText (hDC, buffer, buffer.length, rect, flags);
 	int headerWidth = rect.right - rect.left + Tree.HEADER_MARGIN;
 	if (OS.IsAppThemed ()) headerWidth += Tree.HEADER_EXTRA;
-	if (image != null || parent.sortColumn == this) {
-		Image headerImage = null;
-		if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) {
-			headerWidth += Tree.SORT_WIDTH;
-		} else {
-			headerImage = image;
-		}
-		if (headerImage != null) {
-			Rectangle bounds = Win32DPIUtils.pointToPixel(headerImage.getBounds(), getZoom());
-			headerWidth += bounds.width;
-		}
+	if (image != null) {
+		Rectangle bounds = Win32DPIUtils.pointToPixel(image.getBounds(), getZoom());
+		headerWidth += bounds.width;
 		int margin = 0;
 		if (hwndHeader != 0) {
 			margin = (int)OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0);