Merge pull request #68027 from ktxyz/window-on-top

Update sub_windows order with respect to FLAG_ALWAYS_ON_TOP
This commit is contained in:
Rémi Verschelde 2023-02-14 13:40:24 +01:00
commit 830eff64a7
No known key found for this signature in database
GPG Key ID: C3336907360768E1

View File

@ -166,6 +166,24 @@ ViewportTexture::~ViewportTexture() {
}
void Viewport::_sub_window_update_order() {
if (gui.sub_windows.size() < 2) {
return;
}
if (!gui.sub_windows[gui.sub_windows.size() - 1].window->get_flag(Window::FLAG_ALWAYS_ON_TOP)) {
int index = gui.sub_windows.size() - 1;
while (index > 0 && gui.sub_windows[index - 1].window->get_flag(Window::FLAG_ALWAYS_ON_TOP)) {
--index;
}
if (index != (gui.sub_windows.size() - 1)) {
SubWindow sw = gui.sub_windows[gui.sub_windows.size() - 1];
gui.sub_windows.remove_at(gui.sub_windows.size() - 1);
gui.sub_windows.insert(index, sw);
}
}
for (int i = 0; i < gui.sub_windows.size(); i++) {
RS::get_singleton()->canvas_item_set_draw_index(gui.sub_windows[i].canvas_item, i);
}