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

Fix theme propagation for children of top level controls

This commit is contained in:
Yuri Sizov 2022-06-01 03:56:51 +03:00
parent af8a02ddaf
commit 8ed297fc83
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
scene/gui/control.cpp
View File

@ -490,53 +490,45 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_ENTER_CANVAS: {
data.parent = Object::cast_to<Control>(get_parent());
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) {
data.theme_owner = data.parent->data.theme_owner;
notification(NOTIFICATION_THEME_CHANGED);
}
} else {
Node *parent = this; //meh
Control *parent_control = nullptr;
bool subwindow = false;
while (parent) {
parent = parent->get_parent();
if (!parent) {
break;
}
CanvasItem *ci = Object::cast_to<CanvasItem>(parent);
if (ci && ci->is_set_as_toplevel()) {
subwindow = true;
break;
}
parent_control = Object::cast_to<Control>(parent);
if (parent_control) {
break;
} else if (ci) {
} else {
break;
}
}
if (parent_control) {
//do nothing, has a parent control
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)
if (is_set_as_toplevel()) {
data.SI = get_viewport()->_gui_add_subwindow_control(this);
} else {
//is a regular root control
Node *parent = get_parent();
bool is_subwindow = false;
bool has_parent_control = false;
while (parent) {
CanvasItem *ci = Object::cast_to<CanvasItem>(parent);
if (ci && ci->is_set_as_toplevel()) {
is_subwindow = true;
break;
}
Control *parent_control = Object::cast_to<Control>(parent);
if (parent_control) {
has_parent_control = true;
break;
} else if (ci) {
// Continue.
} else {
break;
}
parent = parent->get_parent();
}
if (has_parent_control) {
// Do nothing, has a parent control.
} else if (is_subwindow) {
// Is a subwindow (process input before other controls for that canvas).
data.SI = get_viewport()->_gui_add_subwindow_control(this);
} else {
// Is a regular root control.
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
data.RI = viewport->_gui_add_root_control(this);
@ -547,7 +539,7 @@ void Control::_notification(int p_notification) {
if (data.parent_canvas_item) {
data.parent_canvas_item->connect("item_rect_changed", this, "_size_changed");
} else {
//connect viewport
// Connect viewport.
Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport);
viewport->connect("size_changed", this, "_size_changed");