From fa59defb53b405a61e434785fa8ef6061335d2ba Mon Sep 17 00:00:00 2001 From: SeleckyErik <35656626+SeleckyErik@users.noreply.github.com> Date: Wed, 23 Oct 2019 03:08:23 +0100 Subject: Theme code refactoring - Move GDScript-exposed function definitions from header to source file - Add null check to functions taking list pointers as parameters - Call clear() in copy_theme() if null is passed --- scene/resources/theme.cpp | 115 +++++++++++++++++++++++++++++++++++++++++++++- scene/resources/theme.h | 72 ++++------------------------- 2 files changed, 122 insertions(+), 65 deletions(-) diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index ae18be1695..f1429a7d7b 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -37,6 +37,97 @@ void Theme::_emit_theme_changed() { emit_changed(); } +PoolVector Theme::_get_icon_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_icon_list(p_type, &il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_stylebox_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_stylebox_list(p_type, &il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_stylebox_types(void) const { + + PoolVector ilret; + List il; + + get_stylebox_types(&il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_font_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_font_list(p_type, &il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_color_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_color_list(p_type, &il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_constant_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_constant_list(p_type, &il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + +PoolVector Theme::_get_type_list(const String &p_type) const { + + PoolVector ilret; + List il; + + get_type_list(&il); + ilret.resize(il.size()); + for (List::Element *E = il.front(); E; E = E->next()) { + ilret.push_back(E->get()); + } + return ilret; +} + bool Theme::_set(const StringName &p_name, const Variant &p_value) { String sname = p_name; @@ -300,6 +391,8 @@ void Theme::clear_icon(const StringName &p_name, const StringName &p_type) { void Theme::get_icon_list(StringName p_type, List *p_list) const { + ERR_FAIL_NULL(p_list); + if (!icon_map.has(p_type)) return; @@ -344,6 +437,9 @@ void Theme::clear_shader(const StringName &p_name, const StringName &p_type) { } void Theme::get_shader_list(const StringName &p_type, List *p_list) const { + + ERR_FAIL_NULL(p_list); + if (!shader_map.has(p_type)) return; @@ -408,6 +504,8 @@ void Theme::clear_stylebox(const StringName &p_name, const StringName &p_type) { void Theme::get_stylebox_list(StringName p_type, List *p_list) const { + ERR_FAIL_NULL(p_list); + if (!style_map.has(p_type)) return; @@ -420,6 +518,8 @@ void Theme::get_stylebox_list(StringName p_type, List *p_list) const } void Theme::get_stylebox_types(List *p_list) const { + ERR_FAIL_NULL(p_list); + const StringName *key = NULL; while ((key = style_map.next(key))) { p_list->push_back(*key); @@ -478,6 +578,8 @@ void Theme::clear_font(const StringName &p_name, const StringName &p_type) { void Theme::get_font_list(StringName p_type, List *p_list) const { + ERR_FAIL_NULL(p_list); + if (!font_map.has(p_type)) return; @@ -526,6 +628,8 @@ void Theme::clear_color(const StringName &p_name, const StringName &p_type) { void Theme::get_color_list(StringName p_type, List *p_list) const { + ERR_FAIL_NULL(p_list); + if (!color_map.has(p_type)) return; @@ -574,6 +678,8 @@ void Theme::clear_constant(const StringName &p_name, const StringName &p_type) { void Theme::get_constant_list(StringName p_type, List *p_list) const { + ERR_FAIL_NULL(p_list); + if (!constant_map.has(p_type)) return; @@ -637,6 +743,12 @@ void Theme::copy_default_theme() { void Theme::copy_theme(const Ref &p_other) { + if (p_other.is_null()) { + clear(); + + return; + } + //these need reconnecting, so add normally { const StringName *K = NULL; @@ -680,8 +792,9 @@ void Theme::copy_theme(const Ref &p_other) { void Theme::get_type_list(List *p_list) const { - Set types; + ERR_FAIL_NULL(p_list); + Set types; const StringName *key = NULL; while ((key = icon_map.next(key))) { diff --git a/scene/resources/theme.h b/scene/resources/theme.h index 187694de65..471e5b1a51 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -52,6 +52,14 @@ class Theme : public Resource { HashMap > color_map; HashMap > constant_map; + PoolVector _get_icon_list(const String &p_type) const; + PoolVector _get_stylebox_list(const String &p_type) const; + PoolVector _get_stylebox_types(void) const; + PoolVector _get_font_list(const String &p_type) const; + PoolVector _get_color_list(const String &p_type) const; + PoolVector _get_constant_list(const String &p_type) const; + PoolVector _get_type_list(const String &p_type) const; + protected: bool _set(const StringName &p_name, const Variant &p_value); bool _get(const StringName &p_name, Variant &r_ret) const; @@ -65,70 +73,6 @@ protected: Ref default_theme_font; - PoolVector _get_icon_list(const String &p_type) const { - PoolVector ilret; - List il; - get_icon_list(p_type, &il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_stylebox_list(const String &p_type) const { - PoolVector ilret; - List il; - get_stylebox_list(p_type, &il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_stylebox_types(void) const { - PoolVector ilret; - List il; - get_stylebox_types(&il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_font_list(const String &p_type) const { - PoolVector ilret; - List il; - get_font_list(p_type, &il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_color_list(const String &p_type) const { - PoolVector ilret; - List il; - get_color_list(p_type, &il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_constant_list(const String &p_type) const { - PoolVector ilret; - List il; - get_constant_list(p_type, &il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - PoolVector _get_type_list(const String &p_type) const { - PoolVector ilret; - List il; - get_type_list(&il); - for (List::Element *E = il.front(); E; E = E->next()) { - ilret.push_back(E->get()); - } - return ilret; - } - static void _bind_methods(); public: -- cgit v1.2.3