Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keep focus on floating window when showing ProgressDialog

Browse source
This commit is contained in:
trollodel 2023-10-13 22:05:02 +02:00
parent 6916349697
commit 9ae48c72b4
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
editor/progress_dialog.cpp
View file

@ -147,6 +147,13 @@ void ProgressDialog::_popup() {
main->set_offset(SIDE_BOTTOM, -style->get_margin(SIDE_BOTTOM)); main->set_offset(SIDE_BOTTOM, -style->get_margin(SIDE_BOTTOM));
if (!is_inside_tree()) { if (!is_inside_tree()) {
for (Window *window : host_windows) {
if (window->has_focus()) {
popup_exclusive_centered(window, ms);
return;
}
}
// No host window found, use main window.
EditorInterface::get_singleton()->popup_dialog_centered(this, ms); EditorInterface::get_singleton()->popup_dialog_centered(this, ms);
} }
} }
@ -226,6 +233,11 @@ void ProgressDialog::end_task(const String &p_task) {
} }
} }
void ProgressDialog::add_host_window(Window *p_window) {
ERR_FAIL_NULL(p_window);
host_windows.push_back(p_window);
}
void ProgressDialog::_cancel_pressed() { void ProgressDialog::_cancel_pressed() {
canceled = true; canceled = true;
} }

4
editor/progress_dialog.h
View file

@ -81,6 +81,8 @@ class ProgressDialog : public PopupPanel {
VBoxContainer *main = nullptr; VBoxContainer *main = nullptr;
uint64_t last_progress_tick; uint64_t last_progress_tick;
LocalVector<Window *> host_windows;
static ProgressDialog *singleton; static ProgressDialog *singleton;
void _popup(); void _popup();
@ -96,6 +98,8 @@ public:
bool task_step(const String &p_task, const String &p_state, int p_step = -1, bool p_force_redraw = true); bool task_step(const String &p_task, const String &p_state, int p_step = -1, bool p_force_redraw = true);
void end_task(const String &p_task); void end_task(const String &p_task);
void add_host_window(Window *p_window);
ProgressDialog(); ProgressDialog();
}; };

3
editor/window_wrapper.cpp
View file

@ -34,6 +34,7 @@
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/editor_string_names.h" #include "editor/editor_string_names.h"
#include "editor/progress_dialog.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/panel.h" #include "scene/gui/panel.h"
@ -332,6 +333,8 @@ WindowWrapper::WindowWrapper() {
window_background = memnew(Panel); window_background = memnew(Panel);
window_background->set_anchors_and_offsets_preset(PRESET_FULL_RECT); window_background->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
window->add_child(window_background); window->add_child(window_background);
ProgressDialog::get_singleton()->add_host_window(window);
} }
// ScreenSelect // ScreenSelect