From 958dbc11736d5c170ef1c6b7fc059bd69ae4bfab Mon Sep 17 00:00:00 2001 From: Avril Date: Fri, 18 Nov 2016 06:13:36 +0100 Subject: fixes #6464 lost icons in dock and file dialog, also #6443 , #6302 Fixes lost icons in docks, file manager, sample library, settings and various other places. --- scene/gui/control.cpp | 8 ++++---- 1 file 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); -- cgit v1.2.3