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

Add size check to prevent popup bigger than the screen itself
godotengine · Feb 18, 2024 · dfcecb7 · dfcecb7
2 parents 5f05e2b + 34210e8
commit dfcecb7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -1770,7 +1770,10 @@ void Window::popup(const Rect2i &p_screen_rect) {
 
 	if (p_screen_rect != Rect2i()) {
 		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();