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

Merge pull request #61587 from YuriSizov/control-fix-theme-owner-toplevel

Browse source 
Fix theme propagation for children of top level controls and windows
This commit is contained in:
Rémi Verschelde 2022-06-27 12:03:36 +02:00 committed by GitHub
commit 82a56e5c42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scene/gui/control.cpp
View file

@ -723,8 +723,20 @@ void Control::_notification(int p_notification) {
data.parent_window = Object::cast_to<Window>(get_parent()); data.parent_window = Object::cast_to<Window>(get_parent());
data.is_rtl_dirty = true; data.is_rtl_dirty = true;
if (data.theme.is_null()) {
if (data.parent && (data.parent->data.theme_owner || data.parent->data.theme_owner_window)) {
data.theme_owner = data.parent->data.theme_owner;
data.theme_owner_window = data.parent->data.theme_owner_window;
notification(NOTIFICATION_THEME_CHANGED);
} else if (data.parent_window && (data.parent_window->theme_owner || data.parent_window->theme_owner_window)) {
data.theme_owner = data.parent_window->theme_owner;
data.theme_owner_window = data.parent_window->theme_owner_window;
notification(NOTIFICATION_THEME_CHANGED);
}
}
CanvasItem *node = this; CanvasItem *node = this;
Control *parent_control = nullptr; bool has_parent_control = false;
while (!node->is_set_as_top_level()) { while (!node->is_set_as_top_level()) {
CanvasItem *parent = Object::cast_to<CanvasItem>(node->get_parent()); CanvasItem *parent = Object::cast_to<CanvasItem>(node->get_parent());
@ -732,22 +744,19 @@ void Control::_notification(int p_notification) {
break; break;
} }
parent_control = Object::cast_to<Control>(parent); Control *parent_control = Object::cast_to<Control>(parent);
if (parent_control) { if (parent_control) {
has_parent_control = true;
break; break;
} }
node = parent; node = parent;
} }
if (parent_control) { if (has_parent_control) {
// Do nothing, has a 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 { } else {
//is a regular root control or top_level // Is a regular root control or top_level.
Viewport *viewport = get_viewport(); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport); ERR_FAIL_COND(!viewport);
data.RI = viewport->_gui_add_root_control(this); data.RI = viewport->_gui_add_root_control(this);
@ -758,7 +767,7 @@ void Control::_notification(int p_notification) {
if (data.parent_canvas_item) { if (data.parent_canvas_item) {
data.parent_canvas_item->connect("item_rect_changed", callable_mp(this, &Control::_size_changed)); data.parent_canvas_item->connect("item_rect_changed", callable_mp(this, &Control::_size_changed));
} else { } else {
//connect viewport // Connect viewport.
Viewport *viewport = get_viewport(); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport); ERR_FAIL_COND(!viewport);
viewport->connect("size_changed", callable_mp(this, &Control::_size_changed)); viewport->connect("size_changed", callable_mp(this, &Control::_size_changed));

16
scene/main/window.cpp
View file

@ -822,6 +822,22 @@ void Window::_notification(int p_what) {
emit_signal(SceneStringNames::get_singleton()->visibility_changed); emit_signal(SceneStringNames::get_singleton()->visibility_changed);
RS::get_singleton()->viewport_set_active(get_viewport_rid(), true); RS::get_singleton()->viewport_set_active(get_viewport_rid(), true);
} }
if (theme.is_null()) {
Control *parent_c = cast_to<Control>(get_parent());
if (parent_c && (parent_c->data.theme_owner || parent_c->data.theme_owner_window)) {
theme_owner = parent_c->data.theme_owner;
theme_owner_window = parent_c->data.theme_owner_window;
notification(NOTIFICATION_THEME_CHANGED);
} else {
Window *parent_w = cast_to<Window>(get_parent());
if (parent_w && (parent_w->theme_owner || parent_w->theme_owner_window)) {
theme_owner = parent_w->theme_owner;
theme_owner_window = parent_w->theme_owner_window;
notification(NOTIFICATION_THEME_CHANGED);
}
}
}
} break; } break;
case NOTIFICATION_READY: { case NOTIFICATION_READY: {