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

fixes #6464 lost icons in dock and file dialog, also #6443 , #6302

Browse source 
Fixes lost icons in docks, file manager, sample library, settings and
various other places.
This commit is contained in:
Avril 2016-11-18 06:13:36 +01:00
parent 959683c3d8
commit 958dbc1173
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()) { if (is_set_as_toplevel()) {
data.SI=get_viewport()->_gui_add_subwindow_control(this); 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; data.theme_owner=data.parent->data.theme_owner;
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
}*/ }
} else { } else {
@ -519,10 +519,10 @@ void Control::_notification(int p_notification) {
if (parent_control) { if (parent_control) {
//do nothing, has a 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; data.theme_owner=parent_control->data.theme_owner;
notification(NOTIFICATION_THEME_CHANGED); notification(NOTIFICATION_THEME_CHANGED);
}*/ }
} else if (subwindow) { } else if (subwindow) {
//is a subwindow (process input before other controls for that canvas) //is a subwindow (process input before other controls for that canvas)
data.SI=get_viewport()->_gui_add_subwindow_control(this); data.SI=get_viewport()->_gui_add_subwindow_control(this);