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

Merge pull request #83290 from trollodel/move_progress_dialog_on_open 

Keep focus on floating window when showing ProgressDialog
This commit is contained in:
Rémi Verschelde 2023-11-15 14:32:07 +01:00
parent c851a46065 9ae48c72b4
commit d89c5313a5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 19 additions and 0 deletions
Show Stats 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));
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);
}
}
@ -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() {
canceled = true;
}

4
editor/progress_dialog.h
View File

@ -81,6 +81,8 @@ class ProgressDialog : public PopupPanel {
VBoxContainer *main = nullptr;
uint64_t last_progress_tick;
LocalVector<Window *> host_windows;
static ProgressDialog *singleton;
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);
void end_task(const String &p_task);
void add_host_window(Window *p_window);
ProgressDialog();
};

3
editor/window_wrapper.cpp
View File

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