godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ancient bug that prevented proper theme editing, closes #4924

Browse Source 
(cherry picked from commit c1056a9bfb)
This commit is contained in:
Juan Linietsky
2016-06-12 15:31:38 -03:00
committed by Rémi Verschelde
parent c54744ce4d
commit 6525e0017c
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/resources/theme.cpp
View File

@@ -240,7 +240,7 @@ Ref<Texture> Theme::get_icon(const StringName& p_name,const StringName& p_type)
bool Theme::has_icon(const StringName& p_name,const StringName& p_type) const {
return (icon_map.has(p_type) && icon_map[p_type].has(p_name));
return (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid());
}
@@ -337,12 +337,13 @@ Ref<StyleBox> Theme::get_stylebox(const StringName& p_name,const StringName& p_t
return style_map[p_type][p_name];
} else {
return default_style;
}
}
bool Theme::has_stylebox(const StringName& p_name,const StringName& p_type) const {
return (style_map.has(p_type) && style_map[p_type].has(p_name) );
return (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid());
}
void Theme::clear_stylebox(const StringName& p_name,const StringName& p_type) {
@@ -396,7 +397,7 @@ Ref<Font> Theme::get_font(const StringName& p_name,const StringName& p_type) con
bool Theme::has_font(const StringName& p_name,const StringName& p_type) const {
return (font_map.has(p_type) && font_map[p_type].has(p_name));
return (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid());
}
void Theme::clear_font(const StringName& p_name,const StringName& p_type) {