Skip to content

Remove the additional SORT_WIDTH spacing logic in Tree column rendering. #2476

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
merged 1 commit into from
Sep 12, 2025
Merged

Remove the additional SORT_WIDTH spacing logic in Tree column rendering. #2476

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
1 change: 0 additions & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 3 additions & 11 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,17 +377,9 @@ public void pack () {
OS.DrawText (hDC, buffer, buffer.length, rect, flags);
int headerWidth = rect.right - rect.left + Win32DPIUtils.pointToPixel(Tree.HEADER_MARGIN, getZoom());
if (OS.IsAppThemed ()) headerWidth += Win32DPIUtils.pointToPixel(Tree.HEADER_EXTRA, getZoom());
if (image != null || parent.sortColumn == this) {
Image headerImage = null;
if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) {
headerWidth += Win32DPIUtils.pointToPixel(Tree.SORT_WIDTH, getZoom()) ;
} 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);
Expand Down
Loading