Skip to content

Make TreeItem.getExpanded consistent across platforms #2834 #2836

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
iloveeclipse merged 1 commit into from
Dec 5, 2025
+13 −6
Merged

Make TreeItem.getExpanded consistent across platforms #2834 #2836

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
10 changes: 4 additions & 6 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 @@ -535,10 +535,7 @@ public boolean getChecked () {
*/
public boolean getExpanded () {
checkWidget();
long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
boolean answer = GTK.gtk_tree_view_row_expanded (parent.handle, path);
GTK.gtk_tree_path_free (path);
return answer;
return isExpanded;
}

/**
Expand Down Expand Up @@ -1226,7 +1223,8 @@ public void setChecked (boolean checked) {
public void setExpanded (boolean expanded) {
checkWidget();
long path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
if (expanded != GTK.gtk_tree_view_row_expanded (parent.handle, path)) {
// Do nothing when the item is a leaf or already expanded
if (expanded != GTK.gtk_tree_view_row_expanded (parent.handle, path) && GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) != 0) {
if (expanded) {
OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
GTK.gtk_tree_view_expand_row (parent.handle, path, false);
Expand All @@ -1237,9 +1235,9 @@ public void setExpanded (boolean expanded) {
GTK.gtk_tree_view_collapse_row (parent.handle, path);
OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
}
isExpanded = expanded;
}
GTK.gtk_tree_path_free (path);
isExpanded = expanded;
}


Expand Down
9 changes: 9 additions & 0 deletions ....tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,13 +535,22 @@ public void test_getBoundsI() {

@Test
public void test_getExpanded() {
assertFalse(treeItem.getExpanded());
// do nothing when the item is a leaf
treeItem.setExpanded(true);
assertFalse(treeItem.getExpanded());
// there must be at least one subitem before you can set the treeitem expanded
new TreeItem(treeItem, 0);
treeItem.setExpanded(true);
assertTrue(treeItem.getExpanded());
treeItem.setExpanded(false);
assertFalse(treeItem.getExpanded());
treeItem.setExpanded(true);
treeItem.removeAll();
assertTrue(treeItem.getExpanded());
// do nothing when the item is a leaf
treeItem.setExpanded(false);
assertTrue(treeItem.getExpanded());
}

@Test
Expand Down
Loading