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

Merge pull request #80219 from YeldhamDev/override_all_the_things 

Improve `Window._get_contents_minimum_size()`'s code
This commit is contained in:
Rémi Verschelde 2023-08-03 15:33:37 +02:00
parent c97e4a31ac 6d2453425b
commit 725beaa7af
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/main/window.cpp
View File

@ -1748,9 +1748,11 @@ Rect2i Window::fit_rect_in_parent(Rect2i p_rect, const Rect2i &p_parent_rect) co
Size2 Window::get_contents_minimum_size() const { Size2 Window::get_contents_minimum_size() const {
ERR_READ_THREAD_GUARD_V(Size2()); ERR_READ_THREAD_GUARD_V(Size2());
Vector2 ms = _get_contents_minimum_size(); Vector2 ms;
GDVIRTUAL_CALL(_get_contents_minimum_size, ms); if (GDVIRTUAL_CALL(_get_contents_minimum_size, ms)) {
return ms; return ms;
}
return _get_contents_minimum_size();
} }
Size2 Window::get_clamped_minimum_size() const { Size2 Window::get_clamped_minimum_size() const {