diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-21 12:01:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 12:01:23 +0100 |
| commit | 9e2d09f580c319e511d3a816bba8a54138a4bcd1 (patch) | |
| tree | 823b5d83d33075c6a7463dbdcb010263940e61dd /scene/gui/control.cpp | |
| parent | f8d523b68b3f3d82f844caaa6f0e246b11efb66b (diff) | |
| parent | 958dbc11736d5c170ef1c6b7fc059bd69ae4bfab (diff) | |
Merge pull request #7145 from avril-gh/fixes-6464-lost-icons
fixes #6464 lost icons in dock and file dialog, also #6443 , #6302
Diffstat (limited to 'scene/gui/control.cpp')
| -rw-r--r-- | scene/gui/control.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 97f0db97c2..303896b41a 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -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); |