gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-14 15:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59231 from Sauermann/fix-top-level-identification

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-16 15:10:27 +02:00 committed by GitHub
parent eaa4e86433 249d6a4225
commit fa2b3269ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene/gui/control.cpp
View file

@ -712,35 +712,25 @@ void Control::_notification(int p_notification) {
data.parent_window = Object::cast_to<Window>(get_parent());
data.is_rtl_dirty = true;
Node *parent = this; //meh
CanvasItem *node = this;
Control *parent_control = nullptr;
bool subwindow = false;
while (parent) {
parent = parent->get_parent();
while (!node->is_set_as_top_level()) {
CanvasItem *parent = Object::cast_to<CanvasItem>(node->get_parent());
if (!parent) {
break;
}
CanvasItem *ci = Object::cast_to<CanvasItem>(parent);
if (ci && ci->is_set_as_top_level()) {
subwindow = true;
break;
}
parent_control = Object::cast_to<Control>(parent);
if (parent_control) {
break;
} else if (ci) {
} else {
break;
}
node = parent;
}
if (parent_control && !subwindow) {
//do nothing, has a parent control and not top_level
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);