Skip to content
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

Jump to bottom

Tree deselect_all and update selected_item in SELECT_MULTI mode #21291

Closed
wants to merge 1 commit into from
Closed

Tree deselect_all and update selected_item in SELECT_MULTI mode #21291

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
29 changes: 24 additions & 5 deletions scene/gui/tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ void TreeItem::deselect(int p_column) {
_cell_deselected(p_column);
}

void TreeItem::deselect_all() {

tree->deselect_row(this);
}

void TreeItem::add_button(int p_column, const Ref<Texture> &p_button, int p_id, bool p_disabled, const String &p_tooltip) {

ERR_FAIL_INDEX(p_column, cells.size());
Expand Down Expand Up @@ -750,6 +755,7 @@ void TreeItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_selected", "column"), &TreeItem::is_selected);
ClassDB::bind_method(D_METHOD("select", "column"), &TreeItem::select);
ClassDB::bind_method(D_METHOD("deselect", "column"), &TreeItem::deselect);
ClassDB::bind_method(D_METHOD("deselect_all"), &TreeItem::deselect_all);

ClassDB::bind_method(D_METHOD("set_editable", "column", "enabled"), &TreeItem::set_editable);
ClassDB::bind_method(D_METHOD("is_editable", "column"), &TreeItem::is_editable);
Expand Down Expand Up @@ -3075,6 +3081,7 @@ void Tree::item_selected(int p_column, TreeItem *p_item) {
p_item->cells.write[p_column].selected = true;
//emit_signal("multi_selected",p_item,p_column,true); - NO this is for TreeItem::select

selected_item = p_item;
selected_col = p_column;
} else {

Expand All @@ -3085,8 +3092,19 @@ void Tree::item_selected(int p_column, TreeItem *p_item) {

void Tree::item_deselected(int p_column, TreeItem *p_item) {

if (select_mode == SELECT_MULTI || select_mode == SELECT_SINGLE) {
p_item->cells.write[p_column].selected = false;
p_item->cells.write[p_column].selected = false;
update();
}

void Tree::deselect_row(TreeItem *p_item) {

for (int i = 0; i < p_item->cells.size(); i++) {
p_item->cells.write[i].selected = false;
}

if (p_item == selected_item) {
selected_item = NULL;
selected_col = -1;
}
update();
}
Expand All @@ -3105,10 +3123,10 @@ void Tree::deselect_all() {

TreeItem *item = get_next_selected(get_root());
while (item) {
item->deselect(selected_col);
TreeItem *prev_item = item;
for (int i = 0; i < item->cells.size(); i++) {
item->cells.write[i].selected = false;
}
item = get_next_selected(get_root());
ERR_FAIL_COND(item == prev_item);
}

selected_item = NULL;
Expand Down Expand Up @@ -3772,6 +3790,7 @@ void Tree::_bind_methods() {
ClassDB::bind_method(D_METHOD("_value_editor_changed"), &Tree::value_editor_changed);
ClassDB::bind_method(D_METHOD("_scroll_moved"), &Tree::_scroll_moved);

ClassDB::bind_method(D_METHOD("deselect_all"), &Tree::deselect_all);
ClassDB::bind_method(D_METHOD("clear"), &Tree::clear);
ClassDB::bind_method(D_METHOD("create_item", "parent", "idx"), &Tree::_create_item, DEFVAL(Variant()), DEFVAL(-1));

Expand Down
2 changes: 2 additions & 0 deletions scene/gui/tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ class TreeItem : public Object {
bool is_selected(int p_column);
void select(int p_column);
void deselect(int p_column);
void deselect_all();
void set_as_cursor(int p_column);

void set_editable(int p_column, bool p_editable);
Expand Down Expand Up @@ -392,6 +393,7 @@ class Tree : public Control {
void item_changed(int p_column, TreeItem *p_item);
void item_selected(int p_column, TreeItem *p_item);
void item_deselected(int p_column, TreeItem *p_item);
void deselect_row(TreeItem *p_item);

void propagate_set_columns(TreeItem *p_item);

Expand Down