Skip to content

[Gtk4] Fix missing space between TreeItem icon and label #3409

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
akurtakov merged 1 commit into from
Jun 30, 2026
+11 −23
Merged

[Gtk4] Fix missing space between TreeItem icon and label #3409

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
20 changes: 7 additions & 13 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -336,16 +336,13 @@ Rectangle getBoundsinPixels () {
rect.width = w [0];

int horizontalSeparator;
int[] buffer = new int[1];
if (GTK.GTK4) {
long separator = GTK.gtk_separator_new(GTK.GTK_ORIENTATION_HORIZONTAL);
GtkAllocation allocation = new GtkAllocation ();
GTK.gtk_widget_get_allocation(separator, allocation);
horizontalSeparator = allocation.height;
GTK.gtk_cell_renderer_get_padding(textRenderer, buffer, null);
} else {
int[] buffer = new int[1];
GTK3.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
horizontalSeparator = buffer[0];
}
horizontalSeparator = buffer[0];
rect.x += horizontalSeparator;

gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
Expand Down Expand Up @@ -769,16 +766,13 @@ public Rectangle getTextBounds (int index) {
parent.ignoreSize = false;

int horizontalSeparator;
int[] buffer = new int[1];
if (GTK.GTK4) {
long separator = GTK.gtk_separator_new(GTK.GTK_ORIENTATION_HORIZONTAL);
GtkAllocation allocation = new GtkAllocation ();
GTK.gtk_widget_get_allocation(separator, allocation);
horizontalSeparator = allocation.height;
GTK.gtk_cell_renderer_get_padding(textRenderer, buffer, null);
} else {
int[] buffer = new int[1];
GTK3.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
horizontalSeparator = buffer[0];
}
horizontalSeparator = buffer[0];
rect.x += horizontalSeparator;

gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
Expand Down
14 changes: 4 additions & 10 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,14 +481,11 @@ public Rectangle getBounds () {

int horizontalSeparator;
if (GTK.GTK4) {
long separator = GTK.gtk_separator_new(GTK.GTK_ORIENTATION_HORIZONTAL);
GtkAllocation allocation = new GtkAllocation ();
GTK.gtk_widget_get_allocation(separator, allocation);
horizontalSeparator = allocation.height;
GTK.gtk_cell_renderer_get_padding(textRenderer, buffer, null);
} else {
GTK3.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
horizontalSeparator = buffer[0];
}
horizontalSeparator = buffer[0];
rect.x += horizontalSeparator;

gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
Expand Down Expand Up @@ -948,14 +945,11 @@ public Rectangle getTextBounds (int index) {

int horizontalSeparator;
if (GTK.GTK4) {
long separator = GTK.gtk_separator_new(GTK.GTK_ORIENTATION_HORIZONTAL);
GtkAllocation allocation = new GtkAllocation ();
GTK.gtk_widget_get_allocation(separator, allocation);
horizontalSeparator = allocation.height;
GTK.gtk_cell_renderer_get_padding(textRenderer, buffer, null);
} else {
GTK3.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
horizontalSeparator = buffer[0];
}
horizontalSeparator = buffer[0];
rect.x += horizontalSeparator;
gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
/*
Expand Down
Loading