Merge pull request #89303 from V-Sekai/scale-with-dpi-constexpr-4.3

akien-mga · web-flow · commit f28964805e44 · 2024-03-09T10:18:55.000+01:00
Windows: Avoid `scale_with_dpi` constexpr compiler error.
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
@@ -2573,7 +2573,7 @@ struct Win32InputTextDialogInit {
 	const Callable &callback;
 };
 
-static constexpr int scale_with_dpi(int p_pos, int p_dpi) {
+static int scale_with_dpi(int p_pos, int p_dpi) {
 	return IsProcessDPIAware() ? (p_pos * p_dpi / 96) : p_pos;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2573,7 +2573,7 @@ struct Win32InputTextDialogInit {`
`2573`	`2573`	`const Callable &callback;`
`2574`	`2574`	`};`
`2575`	`2575`
`2576`		`-static constexpr int scale_with_dpi(int p_pos, int p_dpi) {`
	`2576`	`+static int scale_with_dpi(int p_pos, int p_dpi) {`
`2577`	`2577`	`return IsProcessDPIAware() ? (p_pos * p_dpi / 96) : p_pos;`
`2578`	`2578`	`}`
`2579`	`2579`