Merge pull request #107488 from KoBeWi/clamped_scale_factory

akien-mga · akien-mga · commit 6f2ab528ca42 · 2025-06-13T15:54:39.000+02:00
Multiply contents minimum size by scale factor
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -2141,7 +2141,7 @@ Size2 Window::get_clamped_minimum_size() const {
 		return min_size;
 	}
 
-	return min_size.max(get_contents_minimum_size());
+	return min_size.max(get_contents_minimum_size() * get_content_scale_factor());
 }
 
 void Window::grab_focus() {

Original file line number	Diff line number	Diff line change
`@@ -2141,7 +2141,7 @@ Size2 Window::get_clamped_minimum_size() const {`
`2141`	`2141`	`return min_size;`
`2142`	`2142`	`}`
`2143`	`2143`
`2144`		`- return min_size.max(get_contents_minimum_size());`
	`2144`	`+ return min_size.max(get_contents_minimum_size() * get_content_scale_factor());`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`void Window::grab_focus() {`