godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7145 from avril-gh/fixes-6464-lost-icons 

fixes #6464 lost icons in dock and file dialog, also #6443 , #6302
This commit is contained in:
Rémi Verschelde 2016-11-21 12:01:23 +01:00 committed by GitHub
parent f8d523b68b 958dbc1173
commit 9e2d09f580
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/control.cpp
View File

@ -480,10 +480,10 @@ void Control::_notification(int p_notification) {
if (is_set_as_toplevel()) {
data.SI=get_viewport()->_gui_add_subwindow_control(this);
/*if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
data.theme_owner=data.parent->data.theme_owner;
notification(NOTIFICATION_THEME_CHANGED);
}*/
}
} else {
@ -519,10 +519,10 @@ void Control::_notification(int p_notification) {
if (parent_control) {
//do nothing, has a parent control
/*if (data.theme.is_null() && parent_control->data.theme_owner) {
if (data.theme.is_null() && parent_control->data.theme_owner) {
data.theme_owner=parent_control->data.theme_owner;
notification(NOTIFICATION_THEME_CHANGED);
}*/
}
} else if (subwindow) {
//is a subwindow (process input before other controls for that canvas)
data.SI=get_viewport()->_gui_add_subwindow_control(this);