From 20c4d267001e1907beb3c7d18464eb7ace31cc12 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sat, 2 Nov 2024 20:55:48 -0400 Subject: [PATCH] Fix internal Button set_icon calls to set_button_icon Due to upstream change: https://github.com/godotengine/godot/commit/562c666e3dfc9f0fe72a33974c23373dff77c825 --- editor/editor_property_bb_param.cpp | 6 +++--- util/limbo_compat.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editor/editor_property_bb_param.cpp b/editor/editor_property_bb_param.cpp index 5969baa..4ab8e89 100644 --- a/editor/editor_property_bb_param.cpp +++ b/editor/editor_property_bb_param.cpp @@ -287,14 +287,14 @@ void EditorPropertyBBParam::update_property() { variable_editor->update_property(); variable_editor->show(); bottom_container->hide(); - type_choice->set_icon(get_editor_theme_icon(SNAME("LimboExtraVariable"))); + type_choice->set_button_icon(get_editor_theme_icon(SNAME("LimboExtraVariable"))); } else { _create_value_editor(param->get_type()); variable_editor->hide(); value_editor->show(); value_editor->set_object_and_property(param.ptr(), SNAME("saved_value")); value_editor->update_property(); - type_choice->set_icon(get_editor_theme_icon(Variant::get_type_name(param->get_type()))); + type_choice->set_button_icon(get_editor_theme_icon(Variant::get_type_name(param->get_type()))); } } @@ -316,7 +316,7 @@ void EditorPropertyBBParam::_notification(int p_what) { { String type = Variant::get_type_name(_get_edited_param()->get_type()); - type_choice->set_icon(get_editor_theme_icon(type)); + type_choice->set_button_icon(get_editor_theme_icon(type)); } // Initialize type choice. diff --git a/util/limbo_compat.h b/util/limbo_compat.h index 68bd59d..17ae2d5 100644 --- a/util/limbo_compat.h +++ b/util/limbo_compat.h @@ -37,7 +37,7 @@ #define IS_CLASS(m_obj, m_class) (m_obj->is_class_ptr(m_class::get_class_ptr_static())) #define RAND_RANGE(m_from, m_to) (Math::random(m_from, m_to)) #define RANDF() (Math::randf()) -#define BUTTON_SET_ICON(m_btn, m_icon) m_btn->set_icon(m_icon) +#define BUTTON_SET_ICON(m_btn, m_icon) m_btn->set_button_icon(m_icon) #define RESOURCE_LOAD(m_path, m_hint) ResourceLoader::load(m_path, m_hint) #define RESOURCE_LOAD_NO_CACHE(m_path, m_hint) ResourceLoader::load(m_path, m_hint, ResourceFormatLoader::CACHE_MODE_IGNORE) #define RESOURCE_SAVE(m_res, m_path, m_flags) ResourceSaver::save(m_res, m_path, m_flags)