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

Fix native popups auto-closing when interacting with non-client area.

Browse Source 
(cherry picked from commit e26a6c36c8)
This commit is contained in:
bruvzg 2023-07-14 09:16:06 +03:00 committed by Yuri Sizov
parent 3d0c29cc0a
commit 02c6d985b8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -3928,7 +3928,7 @@ bool DisplayServerX11::mouse_process_popups() {
// Find top popup to close. // Find top popup to close.
while (E) { while (E) {
// Popup window area. // Popup window area.
Rect2i win_rect = Rect2i(window_get_position(E->get()), window_get_size(E->get())); Rect2i win_rect = Rect2i(window_get_position_with_decorations(E->get()), window_get_size_with_decorations(E->get()));
// Area of the parent window, which responsible for opening sub-menu. // Area of the parent window, which responsible for opening sub-menu.
Rect2i safe_rect = window_get_popup_safe_rect(E->get()); Rect2i safe_rect = window_get_popup_safe_rect(E->get());
if (win_rect.has_point(pos)) { if (win_rect.has_point(pos)) {

2
platform/macos/display_server_macos.mm
View File

@ -3800,7 +3800,7 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) {
// Find top popup to close. // Find top popup to close.
while (E) { while (E) {
// Popup window area. // Popup window area.
Rect2i win_rect = Rect2i(window_get_position(E->get()), window_get_size(E->get())); Rect2i win_rect = Rect2i(window_get_position_with_decorations(E->get()), window_get_size_with_decorations(E->get()));
// Area of the parent window, which responsible for opening sub-menu. // Area of the parent window, which responsible for opening sub-menu.
Rect2i safe_rect = window_get_popup_safe_rect(E->get()); Rect2i safe_rect = window_get_popup_safe_rect(E->get());
if (win_rect.has_point(pos)) { if (win_rect.has_point(pos)) {

2
platform/windows/display_server_windows.cpp
View File

@ -2503,7 +2503,7 @@ LRESULT DisplayServerWindows::MouseProc(int code, WPARAM wParam, LPARAM lParam)
// Find top popup to close. // Find top popup to close.
while (E) { while (E) {
// Popup window area. // Popup window area.
Rect2i win_rect = Rect2i(window_get_position(E->get()), window_get_size(E->get())); Rect2i win_rect = Rect2i(window_get_position_with_decorations(E->get()), window_get_size_with_decorations(E->get()));
// Area of the parent window, which responsible for opening sub-menu. // Area of the parent window, which responsible for opening sub-menu.
Rect2i safe_rect = window_get_popup_safe_rect(E->get()); Rect2i safe_rect = window_get_popup_safe_rect(E->get());
if (win_rect.has_point(pos)) { if (win_rect.has_point(pos)) {