asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

also loop for classes if there is no coustom theme fixes #11250

Browse source
This commit is contained in:
toger5 2017-09-14 18:15:04 +02:00
parent 175777596e
commit 202e4c8836
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/gui/control.cpp
View file

@ -809,9 +809,9 @@ Ref<StyleBox> Control::get_stylebox(const StringName &p_name, const StringName &
// try with custom themes // try with custom themes
Control *theme_owner = data.theme_owner; Control *theme_owner = data.theme_owner;
while (theme_owner) { StringName class_name = type;
StringName class_name = type; while (theme_owner) {
while (class_name != StringName()) { while (class_name != StringName()) {
if (theme_owner->data.theme->has_stylebox(p_name, class_name)) { if (theme_owner->data.theme->has_stylebox(p_name, class_name)) {
@ -829,6 +829,14 @@ Ref<StyleBox> Control::get_stylebox(const StringName &p_name, const StringName &
theme_owner = NULL; theme_owner = NULL;
} }
class_name = type;
while (class_name != StringName()) {
if (Theme::get_default()->has_stylebox(p_name, class_name))
return Theme::get_default()->get_stylebox(p_name, class_name);
class_name = ClassDB::get_parent_class_nocheck(class_name);
}
return Theme::get_default()->get_stylebox(p_name, type); return Theme::get_default()->get_stylebox(p_name, type);
} }
Ref<Font> Control::get_font(const StringName &p_name, const StringName &p_type) const { Ref<Font> Control::get_font(const StringName &p_name, const StringName &p_type) const {