diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-06-09 11:59:01 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-06-13 09:56:08 +0300 |
| commit | f7269fe878179695869d5a0b49b5a01005dfb5a7 (patch) | |
| tree | c6197b0253847879c51038d429bf75b961ec48b8 /scene/gui/popup.h | |
| parent | 803d25a20a80de6e3532c6f85a6b54c22c19c305 (diff) | |
Single-window mode popups and edited scene windows fixes.
Fix single-window mode popup not closing when OptionBox is clicked.
Fix single-window mode submenus closing when parent menu item, that was used to open it is clicked (using same safe-area logic as platform specific code).
Disallow windows that are part of an edited scene from being set as exclusive or popup to prevent it from locking up the editor.
Diffstat (limited to 'scene/gui/popup.h')
| -rw-r--r-- | scene/gui/popup.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/gui/popup.h b/scene/gui/popup.h index 27f46d4a97..b53c8be50f 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -48,8 +48,6 @@ class Popup : public Window { void _initialize_visible_parents(); void _deinitialize_visible_parents(); - void _parent_focused(); - protected: void _close_pressed(); virtual Rect2i _popup_adjust_rect() const override; @@ -57,7 +55,7 @@ protected: void _notification(int p_what); static void _bind_methods(); - void _popup_conditional_hide(); + virtual void _parent_focused(); virtual void _post_popup() override; |