godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

Merge pull request #79617 from sepTN/add-screensize-check-popup

Browse Source 
Add size check to prevent popup bigger than the screen itself
This commit is contained in:
Rémi Verschelde
2024-02-19 00:07:01 +01:00
parent 5f05e2b9b1 34210e812a
commit dfcecb77bd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/window.cpp
View File

@@ -1770,7 +1770,10 @@ void Window::popup(const Rect2i &p_screen_rect) {
if (p_screen_rect != Rect2i()) { if (p_screen_rect != Rect2i()) {
set_position(p_screen_rect.position); set_position(p_screen_rect.position);
set_size(p_screen_rect.size); int screen_id = DisplayServer::get_singleton()->get_screen_from_rect(p_screen_rect);
Size2i screen_size = DisplayServer::get_singleton()->screen_get_usable_rect(screen_id).size;
Size2i new_size = p_screen_rect.size.min(screen_size);
set_size(new_size);
} }
Rect2i adjust = _popup_adjust_rect(); Rect2i adjust = _popup_adjust_rect();