asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #39993 from reduz/make-dialogs-exclusive

Browse source 
Make dialogs exclusive by default, fixes #37732
This commit is contained in:
Rémi Verschelde 2020-06-30 19:30:27 +02:00 committed by GitHub
commit 73262c0f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/gui/dialogs.cpp
View file

@ -51,7 +51,9 @@ void AcceptDialog::_input_from_window(const Ref<InputEvent> &p_event) {
} }
void AcceptDialog::_parent_focused() { void AcceptDialog::_parent_focused() {
_cancel_pressed(); if (!is_exclusive()) {
_cancel_pressed();
}
} }
void AcceptDialog::_notification(int p_what) { void AcceptDialog::_notification(int p_what) {
@ -295,6 +297,7 @@ AcceptDialog::AcceptDialog() {
set_wrap_controls(true); set_wrap_controls(true);
set_visible(false); set_visible(false);
set_transient(true); set_transient(true);
set_exclusive(true);
bg = memnew(Panel); bg = memnew(Panel);
add_child(bg); add_child(bg);

1
scene/gui/dialogs.h
View file

@ -44,6 +44,7 @@ class LineEdit;
class AcceptDialog : public Window { class AcceptDialog : public Window {
GDCLASS(AcceptDialog, Window); GDCLASS(AcceptDialog, Window);
public:
Window *parent_visible; Window *parent_visible;
Panel *bg; Panel *bg;
HBoxContainer *hbc; HBoxContainer *hbc;

12
scene/main/window.cpp
View file

@ -398,6 +398,18 @@ void Window::set_visible(bool p_visible) {
emit_signal(SceneStringNames::get_singleton()->visibility_changed); emit_signal(SceneStringNames::get_singleton()->visibility_changed);
RS::get_singleton()->viewport_set_active(get_viewport_rid(), visible); RS::get_singleton()->viewport_set_active(get_viewport_rid(), visible);
//update transient exclusive
if (transient_parent) {
if (exclusive && visible) {
ERR_FAIL_COND_MSG(transient_parent->exclusive_child && transient_parent->exclusive_child != this, "Transient parent has another exclusive child.");
transient_parent->exclusive_child = this;
} else {
if (transient_parent->exclusive_child == this) {
transient_parent->exclusive_child = nullptr;
}
}
}
} }
void Window::_clear_transient() { void Window::_clear_transient() {