Preserve selection after drop

This commit is contained in:
yds 2024-09-11 00:38:05 -03:00
parent a460c7898b
commit 1742018696
3 changed files with 52 additions and 16 deletions

View File

@ -809,7 +809,7 @@ void LimboAIEditor::_on_visibility_changed() {
} }
void LimboAIEditor::_on_header_pressed() { void LimboAIEditor::_on_header_pressed() {
task_tree->deselect(); task_tree->clear_selection();
#ifdef LIMBOAI_MODULE #ifdef LIMBOAI_MODULE
if (task_tree->get_bt().is_valid()) { if (task_tree->get_bt().is_valid()) {
task_tree->get_bt()->editor_set_section_unfold("blackboard_plan", true); task_tree->get_bt()->editor_set_section_unfold("blackboard_plan", true);
@ -913,7 +913,7 @@ void LimboAIEditor::_on_tasks_dragged(const TypedArray<BTTask> &p_tasks, Ref<BTT
} }
} }
undo_redo->add_undo_method(task->get_parent().ptr(), "add_child_at_index", task, task->get_index()); undo_redo->add_undo_method(task->get_parent().ptr(), LW_NAME(add_child_at_index), task, task->get_index());
++drop_idx; ++drop_idx;
} }

View File

@ -108,10 +108,7 @@ void TaskTree::_update_item(TreeItem *p_item) {
} }
void TaskTree::_update_tree() { void TaskTree::_update_tree() {
Ref<BTTask> sel; Vector<Ref<BTTask>> selection = get_selected_tasks();
if (tree->get_selected()) {
sel = tree->get_selected()->get_metadata(0);
}
tree->clear(); tree->clear();
if (bt.is_null()) { if (bt.is_null()) {
@ -124,9 +121,8 @@ void TaskTree::_update_tree() {
updating_tree = false; updating_tree = false;
} }
TreeItem *item = _find_item(sel); for (const Ref<BTTask> &task : selection) {
if (item) { add_selection(task);
item->select(0);
} }
} }
@ -232,6 +228,22 @@ void TaskTree::update_task(const Ref<BTTask> &p_task) {
} }
} }
void TaskTree::add_selection(const Ref<BTTask> &p_task) {
ERR_FAIL_COND(p_task.is_null());
TreeItem *item = _find_item(p_task);
if (item) {
item->select(0);
}
}
void TaskTree::remove_selection(const Ref<BTTask> &p_task) {
ERR_FAIL_COND(p_task.is_null());
TreeItem *item = _find_item(p_task);
if (item) {
item->deselect(0);
}
}
Ref<BTTask> TaskTree::get_selected() const { Ref<BTTask> TaskTree::get_selected() const {
if (tree->get_selected()) { if (tree->get_selected()) {
return tree->get_selected()->get_metadata(0); return tree->get_selected()->get_metadata(0);
@ -239,10 +251,29 @@ Ref<BTTask> TaskTree::get_selected() const {
return nullptr; return nullptr;
} }
void TaskTree::deselect() { Vector<Ref<BTTask>> TaskTree::get_selected_tasks() const {
TreeItem *sel = tree->get_selected(); Vector<Ref<BTTask>> selected_tasks;
if (sel) { TreeItem *next = tree->get_next_selected(nullptr);
sel->deselect(0); while (next) {
Ref<BTTask> task = next->get_metadata(0);
if (task.is_valid()) {
selected_tasks.push_back(task);
}
next = tree->get_next_selected(next);
}
return selected_tasks;
}
void TaskTree::clear_selection() {
Vector<TreeItem*> selected_tasks;
TreeItem *next = tree->get_next_selected(nullptr);
while (next) {
Ref<BTTask> task = next->get_metadata(0);
if (task.is_valid()) {
remove_selection(task);
}
next = tree->get_next_selected(next);
} }
} }
@ -327,7 +358,7 @@ Variant TaskTree::_get_drag_data_fw(const Point2 &p_point) {
} }
} }
set_drag_preview(vb); set_drag_preview(vb);
Dictionary drag_data; Dictionary drag_data;
drag_data["type"] = "task"; drag_data["type"] = "task";
drag_data["tasks"] = selected_tasks; drag_data["tasks"] = selected_tasks;
@ -501,8 +532,10 @@ void TaskTree::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_bt"), &TaskTree::get_bt); ClassDB::bind_method(D_METHOD("get_bt"), &TaskTree::get_bt);
ClassDB::bind_method(D_METHOD("update_tree"), &TaskTree::update_tree); ClassDB::bind_method(D_METHOD("update_tree"), &TaskTree::update_tree);
ClassDB::bind_method(D_METHOD("update_task", "task"), &TaskTree::update_task); ClassDB::bind_method(D_METHOD("update_task", "task"), &TaskTree::update_task);
ClassDB::bind_method(D_METHOD("add_selection", "task"), &TaskTree::add_selection);
ClassDB::bind_method(D_METHOD("remove_selection", "task"), &TaskTree::remove_selection);
ClassDB::bind_method(D_METHOD("get_selected"), &TaskTree::get_selected); ClassDB::bind_method(D_METHOD("get_selected"), &TaskTree::get_selected);
ClassDB::bind_method(D_METHOD("deselect"), &TaskTree::deselect); ClassDB::bind_method(D_METHOD("clear_selection"), &TaskTree::clear_selection);
ClassDB::bind_method(D_METHOD("_get_drag_data_fw"), &TaskTree::_get_drag_data_fw); ClassDB::bind_method(D_METHOD("_get_drag_data_fw"), &TaskTree::_get_drag_data_fw);
ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &TaskTree::_can_drop_data_fw); ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &TaskTree::_can_drop_data_fw);

View File

@ -90,8 +90,11 @@ public:
Ref<BehaviorTree> get_bt() const { return bt; } Ref<BehaviorTree> get_bt() const { return bt; }
void update_tree() { _update_tree(); } void update_tree() { _update_tree(); }
void update_task(const Ref<BTTask> &p_task); void update_task(const Ref<BTTask> &p_task);
void add_selection(const Ref<BTTask> &p_task);
void remove_selection(const Ref<BTTask> &p_task);
Ref<BTTask> get_selected() const; Ref<BTTask> get_selected() const;
void deselect(); Vector<Ref<BTTask>> get_selected_tasks() const;
void clear_selection();
Rect2 get_selected_probability_rect() const; Rect2 get_selected_probability_rect() const;
double get_selected_probability_weight() const; double get_selected_probability_weight() const;