Merge pull request #80219 from YeldhamDev/override_all_the_things

Improve `Window._get_contents_minimum_size()`'s code
godotengine · Aug 3, 2023 · 725beaa · 725beaa
2 parents c97e4a3 + 6d24534
commit 725beaa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -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 {
 	ERR_READ_THREAD_GUARD_V(Size2());
-	Vector2 ms = _get_contents_minimum_size();
-	GDVIRTUAL_CALL(_get_contents_minimum_size, ms);
-	return ms;
+	Vector2 ms;
+	if (GDVIRTUAL_CALL(_get_contents_minimum_size, ms)) {
+		return ms;
+	}
+	return _get_contents_minimum_size();
 }
 
 Size2 Window::get_clamped_minimum_size() const {