From 004d456983fbc3e336c2c08736176f21e6f81062 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 2 Feb 2024 15:04:19 -0500 Subject: [PATCH 1/6] Fix upstream EditorScale header locations Due to upstream change: https://github.com/godotengine/godot/commit/4b55c81ebae48c53e88654a42c04365391b6159d --- editor/action_banner.cpp | 2 +- editor/blackboard_plan_editor.cpp | 2 +- editor/debugger/behavior_tree_view.cpp | 2 +- editor/debugger/limbo_debugger_plugin.cpp | 2 +- editor/limbo_ai_editor_plugin.cpp | 2 +- editor/task_palette.cpp | 2 +- editor/task_tree.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/editor/action_banner.cpp b/editor/action_banner.cpp index b3764a1..c779e1c 100644 --- a/editor/action_banner.cpp +++ b/editor/action_banner.cpp @@ -17,7 +17,7 @@ #include "../util/limbo_string_names.h" #ifdef LIMBOAI_MODULE -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #endif // LIMBOAI_MODULE diff --git a/editor/blackboard_plan_editor.cpp b/editor/blackboard_plan_editor.cpp index a6f1223..deee69e 100644 --- a/editor/blackboard_plan_editor.cpp +++ b/editor/blackboard_plan_editor.cpp @@ -19,7 +19,7 @@ #ifdef LIMBOAI_MODULE #include "editor/editor_interface.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/gui/panel_container.h" #include "scene/resources/style_box_flat.h" diff --git a/editor/debugger/behavior_tree_view.cpp b/editor/debugger/behavior_tree_view.cpp index 9520e74..11cba93 100644 --- a/editor/debugger/behavior_tree_view.cpp +++ b/editor/debugger/behavior_tree_view.cpp @@ -24,7 +24,7 @@ #include "core/object/callable_method_pointer.h" #include "core/os/time.h" #include "core/typedefs.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "editor/editor_settings.h" #include "scene/resources/style_box.h" #endif // LIMBOAI_MODULE diff --git a/editor/debugger/limbo_debugger_plugin.cpp b/editor/debugger/limbo_debugger_plugin.cpp index 762b78b..697796f 100644 --- a/editor/debugger/limbo_debugger_plugin.cpp +++ b/editor/debugger/limbo_debugger_plugin.cpp @@ -31,9 +31,9 @@ #include "core/variant/array.h" #include "editor/editor_interface.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" #include "editor/filesystem_dock.h" #include "editor/plugins/editor_debugger_plugin.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/item_list.h" diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp index 82df889..2b72241 100644 --- a/editor/limbo_ai_editor_plugin.cpp +++ b/editor/limbo_ai_editor_plugin.cpp @@ -34,12 +34,12 @@ #include "editor/editor_file_system.h" #include "editor/editor_help.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/inspector_dock.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/project_settings_editor.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/panel_container.h" #include "scene/gui/separator.h" #endif // LIMBOAI_MODULE diff --git a/editor/task_palette.cpp b/editor/task_palette.cpp index 8067b25..1987322 100644 --- a/editor/task_palette.cpp +++ b/editor/task_palette.cpp @@ -24,7 +24,7 @@ #include "editor/editor_help.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/gui/check_box.h" #endif // LIMBO_MODULE diff --git a/editor/task_tree.cpp b/editor/task_tree.cpp index ab27269..c3bab38 100644 --- a/editor/task_tree.cpp +++ b/editor/task_tree.cpp @@ -20,7 +20,7 @@ #ifdef LIMBOAI_MODULE #include "core/object/script_language.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #endif // LIMBOAI_MODULE #ifdef LIMBOAI_GDEXTENSION From 54605dbffabd03327d68602c40b8241c6f64382d Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sun, 18 Feb 2024 18:36:36 -0500 Subject: [PATCH 2/6] Migrate to Tree::set_custom_draw_callback. Due to upstream change: https://github.com/godotengine/godot/commit/a32a2eaedc5eb8b3e9a01f0458bdd37485037ce9 --- editor/debugger/behavior_tree_view.cpp | 14 +++++++------- editor/task_tree.cpp | 2 +- util/limbo_string_names.cpp | 5 ----- util/limbo_string_names.h | 5 ----- 4 files changed, 8 insertions(+), 18 deletions(-) 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 c3bab38..8eaece9 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 0f1dd67..643a891 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 fe62c27..48189ba 100644 --- a/util/limbo_string_names.h +++ b/util/limbo_string_names.h @@ -41,11 +41,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; From 181a45bf4a91415fe84ebe4bd2c492ac33cbe8fc Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sat, 2 Mar 2024 10:59:01 -0500 Subject: [PATCH 3/6] Fix bottom panel visbility calls Due to upstream change: https://github.com/godotengine/godot/commit/eb6ca91ba6f04a4ff2e21b3ca097c92b6a68dbc8 --- editor/limbo_ai_editor_plugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp index 2b72241..e8f4c96 100644 --- a/editor/limbo_ai_editor_plugin.cpp +++ b/editor/limbo_ai_editor_plugin.cpp @@ -36,6 +36,7 @@ #include "editor/editor_paths.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_bottom_panel.h" #include "editor/inspector_dock.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/project_settings_editor.h" @@ -682,7 +683,7 @@ void LimboAIEditor::_misc_option_selected(int p_id) { LimboDebuggerPlugin::get_singleton()->get_first_session_window()->set_window_enabled(true); } else { #ifdef LIMBOAI_MODULE - EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorDebuggerNode::get_singleton()); + EditorNode::get_bottom_panel()->make_item_visible(EditorDebuggerNode::get_singleton()); EditorDebuggerNode::get_singleton()->get_default_debugger()->switch_to_debugger( LimboDebuggerPlugin::get_singleton()->get_first_session_tab_index()); #elif LIMBOAI_GDEXTENSION From f8df4e695e73d6a87b39ccb8afbb9cb06fc65cc1 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sat, 2 Mar 2024 11:09:11 -0500 Subject: [PATCH 4/6] Add missing MarginContainer header Due to upstream change: https://github.com/godotengine/godot/commit/7884d632812996ef26184412846c533276cb4cc0 --- editor/blackboard_plan_editor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/editor/blackboard_plan_editor.cpp b/editor/blackboard_plan_editor.cpp index deee69e..70dde88 100644 --- a/editor/blackboard_plan_editor.cpp +++ b/editor/blackboard_plan_editor.cpp @@ -21,6 +21,7 @@ #include "editor/editor_interface.h" #include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" +#include "scene/gui/margin_container.h" #include "scene/gui/panel_container.h" #include "scene/resources/style_box_flat.h" #endif // LIMBOAI_MODULE From ad710281359d1ed9abfbc3098621dc2b4cf881b9 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sun, 21 Apr 2024 16:26:10 -0400 Subject: [PATCH 5/6] Update EditorHelpBit calls Due to upstream change: https://github.com/godotengine/godot/commit/a714cb9f65faefaa21bef240397ca6d249edd53c --- editor/task_palette.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/task_palette.cpp b/editor/task_palette.cpp index 1987322..f49bb93 100644 --- a/editor/task_palette.cpp +++ b/editor/task_palette.cpp @@ -60,7 +60,7 @@ void TaskButton::_bind_methods() { Control *TaskButton::_do_make_tooltip(const String &p_text) const { #ifdef LIMBOAI_MODULE EditorHelpBit *help_bit = memnew(EditorHelpBit); - help_bit->get_rich_text()->set_custom_minimum_size(Size2(360 * EDSCALE, 1)); + help_bit->set_content_height_limits(1, 360 * EDSCALE); String help_text; if (!p_text.is_empty()) { @@ -69,7 +69,7 @@ Control *TaskButton::_do_make_tooltip(const String &p_text) const { help_text = "[i]" + TTR("No description.") + "[/i]"; } - help_bit->set_text(help_text); + help_bit->set_custom_text(String(), String(), help_text); return help_bit; #endif // LIMBOAI_MODULE From c42d9ebedff44df89002cdca7f57c51e1812c1f5 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Mon, 29 Apr 2024 10:22:08 -0400 Subject: [PATCH 6/6] Update EditorPlugin header location Due to upstream change: https://github.com/godotengine/godot/commit/1bcbbe96c4dcff1b80ac9df12b59d765e2b1efd6 --- editor/limbo_ai_editor_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/limbo_ai_editor_plugin.h b/editor/limbo_ai_editor_plugin.h index 6ee0725..a5350c3 100644 --- a/editor/limbo_ai_editor_plugin.h +++ b/editor/limbo_ai_editor_plugin.h @@ -25,7 +25,7 @@ #include "core/object/object.h" #include "core/templates/hash_set.h" #include "editor/editor_node.h" -#include "editor/editor_plugin.h" +#include "editor/plugins/editor_plugin.h" #include "editor/gui/editor_spin_slider.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h"