Merge pull request #86894 from jsjtxietian/merge-dafault-font

In `merge_with` also merge some default fields of theme
godotengine · Jan 9, 2024 · 1d3f98a · 1d3f98a
2 parents a50a6b9 + 6f3568e
commit 1d3f98a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
@@ -1613,6 +1613,17 @@ void Theme::merge_with(const Ref<Theme> &p_other) {
 		}
 	}
 
+	// Defaults.
+	if (p_other->has_default_font()) {
+		set_default_font(p_other->default_font);
+	}
+	if (p_other->has_default_font_size()) {
+		set_default_font_size(p_other->default_font_size);
+	}
+	if (p_other->has_default_base_scale()) {
+		set_default_base_scale(p_other->default_base_scale);
+	}
+
 	_unfreeze_and_propagate_changes();
 }