Skip to content

Commit 725beaa

Browse files
committed
Merge pull request #80219 from YeldhamDev/override_all_the_things
Improve `Window._get_contents_minimum_size()`'s code
2 parents c97e4a3 + 6d24534 commit 725beaa

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

scene/main/window.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -1748,9 +1748,11 @@ Rect2i Window::fit_rect_in_parent(Rect2i p_rect, const Rect2i &p_parent_rect) co
17481748

17491749
Size2 Window::get_contents_minimum_size() const {
17501750
ERR_READ_THREAD_GUARD_V(Size2());
1751-
Vector2 ms = _get_contents_minimum_size();
1752-
GDVIRTUAL_CALL(_get_contents_minimum_size, ms);
1753-
return ms;
1751+
Vector2 ms;
1752+
if (GDVIRTUAL_CALL(_get_contents_minimum_size, ms)) {
1753+
return ms;
1754+
}
1755+
return _get_contents_minimum_size();
17541756
}
17551757

17561758
Size2 Window::get_clamped_minimum_size() const {

0 commit comments

Comments
 (0)