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

Merge pull request #94488 from Alex2782/fix_create_folder_94446

Browse Source 
Fix `exclusive` child window
This commit is contained in:
Thaddeus Crews
2025-10-21 19:09:30 -05:00
parent 81910428e6 4523514123
commit 201eed7129
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scene/main/viewport.cpp
View File

@ -272,17 +272,31 @@ void Viewport::_sub_window_update_order() {
return; return;
} }
if (!gui.sub_windows[gui.sub_windows.size() - 1].window->get_flag(Window::FLAG_ALWAYS_ON_TOP)) { // Reorder 'always on top' windows.
int index = gui.sub_windows.size() - 1; int last_index = gui.sub_windows.size() - 1;
for (int index = last_index, insert_index = last_index; index >= 0; index--) {
while (index > 0 && gui.sub_windows[index - 1].window->get_flag(Window::FLAG_ALWAYS_ON_TOP)) { SubWindow sw = gui.sub_windows[index];
--index; Window *parent_window = sw.window->get_parent_visible_window();
bool parent_is_always_on_top = (parent_window != nullptr) && parent_window->get_flag(Window::FLAG_ALWAYS_ON_TOP);
if (sw.window->get_flag(Window::FLAG_ALWAYS_ON_TOP) || (parent_is_always_on_top && sw.window->is_exclusive())) {
if (index != insert_index) {
gui.sub_windows.remove_at(index);
gui.sub_windows.insert(insert_index, sw);
}
insert_index--;
}
} }
if (index != (gui.sub_windows.size() - 1)) { // Reorder exclusive children.
SubWindow sw = gui.sub_windows[gui.sub_windows.size() - 1]; for (int parent_index = 0; parent_index < gui.sub_windows.size(); parent_index++) {
gui.sub_windows.remove_at(gui.sub_windows.size() - 1); Window *exclusive_child = gui.sub_windows[parent_index].window->get_exclusive_child();
gui.sub_windows.insert(index, sw); if (exclusive_child != nullptr && exclusive_child->is_visible()) {
int child_index = _sub_window_find(exclusive_child);
if (child_index < parent_index) {
SubWindow sw = gui.sub_windows[child_index];
gui.sub_windows.remove_at(child_index);
gui.sub_windows.insert(parent_index, sw);
}
} }
} }