diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-03 00:09:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 00:09:19 +0200 |
| commit | 2a8531cc56a7110f8248f18b8248fb1ed346c872 (patch) | |
| tree | 294b5fc416158e335986369970bf4ae7aeb1ee8d /scene/main/window.cpp | |
| parent | 7cc1e2062a996fea4005f84cef841092bb98916f (diff) | |
| parent | bb306750ce8e0973229109be3536c6574cf960bd (diff) | |
Merge pull request #41456 from nekomatata/x11-fix-popups
Popup fixes for X11 display server
Diffstat (limited to 'scene/main/window.cpp')
| -rw-r--r-- | scene/main/window.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 68ffdfe2e8..7c2350d1c0 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -246,7 +246,10 @@ void Window::_make_window() { } } + _update_window_callbacks(); + RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_VISIBLE); + DisplayServer::get_singleton()->show_window(window_id); } void Window::_update_from_window() { @@ -378,7 +381,6 @@ void Window::set_visible(bool p_visible) { } if (p_visible && window_id == DisplayServer::INVALID_WINDOW_ID) { _make_window(); - _update_window_callbacks(); } } else { if (visible) { @@ -737,7 +739,6 @@ void Window::_notification(int p_what) { //create if (visible) { _make_window(); - _update_window_callbacks(); } } } |