Merge pull request #92808 from bruvzg/fix_ci_updates

akien-mga · web-flow · commit 56a8db109c72 · 2024-06-06T00:30:06.000+02:00
Fix excessive canvas items updates.
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -1229,14 +1229,12 @@ void Window::_update_viewport_size() {
 		}
 		if (!Math::is_equal_approx(TS->font_get_global_oversampling(), font_oversampling)) {
 			TS->font_set_global_oversampling(font_oversampling);
-			ci_updated = false;
+			if (!ci_updated) {
+				update_canvas_items();
+			}
 		}
 	}
 
-	if (!ci_updated) {
-		update_canvas_items();
-	}
-
 	notification(NOTIFICATION_WM_SIZE_CHANGED);
 
 	if (embedder) {

Original file line number	Diff line number	Diff line change
`@@ -1229,14 +1229,12 @@ void Window::_update_viewport_size() {`
`1229`	`1229`	`}`
`1230`	`1230`	`if (!Math::is_equal_approx(TS->font_get_global_oversampling(), font_oversampling)) {`
`1231`	`1231`	`TS->font_set_global_oversampling(font_oversampling);`
`1232`		`- ci_updated = false;`
	`1232`	`+ if (!ci_updated) {`
	`1233`	`+ update_canvas_items();`
	`1234`	`+ }`
`1233`	`1235`	`}`
`1234`	`1236`	`}`
`1235`	`1237`
`1236`		`- if (!ci_updated) {`
`1237`		`- update_canvas_items();`
`1238`		`- }`
`1239`		`-`
`1240`	`1238`	`notification(NOTIFICATION_WM_SIZE_CHANGED);`
`1241`	`1239`
`1242`	`1240`	`if (embedder) {`