diff --git a/editor/debugger/behavior_tree_view.cpp b/editor/debugger/behavior_tree_view.cpp index 11cba93..c8541a7 100644 --- a/editor/debugger/behavior_tree_view.cpp +++ b/editor/debugger/behavior_tree_view.cpp @@ -127,16 +127,16 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { if (status_changed) { item->set_metadata(1, current_status); if (current_status == BTTask::SUCCESS) { - item->set_custom_draw(0, this, LW_NAME(_draw_success_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_success_status)); item->set_icon(1, theme_cache.icon_success); } else if (current_status == BTTask::FAILURE) { - item->set_custom_draw(0, this, LW_NAME(_draw_failure_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_failure_status)); item->set_icon(1, theme_cache.icon_failure); } else if (current_status == BTTask::RUNNING) { - item->set_custom_draw(0, this, LW_NAME(_draw_running_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_running_status)); item->set_icon(1, theme_cache.icon_running); } else { - item->set_custom_draw(0, this, LW_NAME(_draw_fresh)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_fresh)); item->set_icon(1, nullptr); } } @@ -204,13 +204,13 @@ void BehaviorTreeView::_update_tree(const Ref &p_data) { item->set_icon_max_width(0, 16 * _get_editor_scale()); // Force user icon size. if (task_data.status == BTTask::SUCCESS) { - item->set_custom_draw(0, this, LW_NAME(_draw_success_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_success_status)); item->set_icon(1, theme_cache.icon_success); } else if (task_data.status == BTTask::FAILURE) { - item->set_custom_draw(0, this, LW_NAME(_draw_failure_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_failure_status)); item->set_icon(1, theme_cache.icon_failure); } else if (task_data.status == BTTask::RUNNING) { - item->set_custom_draw(0, this, LW_NAME(_draw_running_status)); + item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_running_status)); item->set_icon(1, theme_cache.icon_running); } diff --git a/editor/task_tree.cpp b/editor/task_tree.cpp index cbd857c..7f60119 100644 --- a/editor/task_tree.cpp +++ b/editor/task_tree.cpp @@ -50,7 +50,7 @@ void TaskTree::_update_item(TreeItem *p_item) { if (p_item->get_parent()) { Ref sel = p_item->get_parent()->get_metadata(0); if (sel.is_valid() && sel->has_probability(p_item->get_index())) { - p_item->set_custom_draw(0, this, LW_NAME(_draw_probability)); + p_item->set_custom_draw_callback(0, callable_mp(this, &TaskTree::_draw_probability)); p_item->set_cell_mode(0, TreeItem::CELL_MODE_CUSTOM); } } diff --git a/util/limbo_string_names.cpp b/util/limbo_string_names.cpp index be1b6f7..3226022 100644 --- a/util/limbo_string_names.cpp +++ b/util/limbo_string_names.cpp @@ -27,11 +27,6 @@ LimboStringNames *LimboStringNames::singleton = nullptr; LimboStringNames::LimboStringNames() { - _draw_failure_status = SN("_draw_failure_status"); - _draw_fresh = SN("_draw_fresh"); - _draw_probability = SN("_draw_probability"); - _draw_running_status = SN("_draw_running_status"); - _draw_success_status = SN("_draw_success_status"); _enter = SN("_enter"); _exit = SN("_exit"); _generate_name = SN("_generate_name"); diff --git a/util/limbo_string_names.h b/util/limbo_string_names.h index 6a7c148..641b121 100644 --- a/util/limbo_string_names.h +++ b/util/limbo_string_names.h @@ -43,11 +43,6 @@ class LimboStringNames { public: _FORCE_INLINE_ static LimboStringNames *get_singleton() { return singleton; } - StringName _draw_failure_status; - StringName _draw_fresh; - StringName _draw_probability; - StringName _draw_running_status; - StringName _draw_success_status; StringName _enter; StringName _exit; StringName _generate_name;