Skip to content

Commit 77819f6

Browse files
committed
Merge pull request godotengine#79617 from sepTN/add-screensize-check-popup
Add size check to prevent popup bigger than the screen itself
2 parents 598634c + edc2fb4 commit 77819f6

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

scene/main/window.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,10 @@ void Window::popup(const Rect2i &p_screen_rect) {
17701770

17711771
if (p_screen_rect != Rect2i()) {
17721772
set_position(p_screen_rect.position);
1773-
set_size(p_screen_rect.size);
1773+
int screen_id = DisplayServer::get_singleton()->get_screen_from_rect(p_screen_rect);
1774+
Size2i screen_size = DisplayServer::get_singleton()->screen_get_usable_rect(screen_id).size;
1775+
Size2i new_size = p_screen_rect.size.min(screen_size);
1776+
set_size(new_size);
17741777
}
17751778

17761779
Rect2i adjust = _popup_adjust_rect();

0 commit comments

Comments
 (0)