3 files changed, 55 insertions, 0 deletions

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 85cd0f9bb4..82f6a8ef57 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -803,6 +803,12 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_font("bold_italics_font", "RichTextLabel", Ref<Font>());
 	theme->set_font("mono_font", "RichTextLabel", Ref<Font>());
 
+	theme->set_font_size("normal_font_size", "RichTextLabel", -1);
+	theme->set_font_size("bold_font_size", "RichTextLabel", -1);
+	theme->set_font_size("italics_font_size", "RichTextLabel", -1);
+	theme->set_font_size("bold_italics_font_size", "RichTextLabel", -1);
+	theme->set_font_size("mono_font_size", "RichTextLabel", -1);
+
 	theme->set_color("default_color", "RichTextLabel", Color(1, 1, 1));
 	theme->set_color("font_color_selected", "RichTextLabel", font_color_selection);
 	theme->set_color("selection_color", "RichTextLabel", Color(0.1, 0.1, 1, 0.8));
@@ -817,6 +823,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("table_hseparation", "RichTextLabel", 3 * scale);
 	theme->set_constant("table_vseparation", "RichTextLabel", 3 * scale);
 
+	theme->set_color("table_odd_row_bg", "RichTextLabel", Color(0, 0, 0, 0));
+	theme->set_color("table_even_row_bg", "RichTextLabel", Color(0, 0, 0, 0));
+	theme->set_color("table_border", "RichTextLabel", Color(0, 0, 0, 0));
 	// Containers
 
 	theme->set_stylebox("bg", "VSplitContainer", make_stylebox(vsplit_bg_png, 1, 1, 1, 1));
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 7c17610df7..fab8642c20 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -53,6 +53,11 @@ void FontData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_antialiased", "antialiased"), &FontData::set_antialiased);
 	ClassDB::bind_method(D_METHOD("get_antialiased"), &FontData::get_antialiased);
 
+	ClassDB::bind_method(D_METHOD("get_variation_list"), &FontData::get_variation_list);
+
+	ClassDB::bind_method(D_METHOD("set_variation", "tag", "value"), &FontData::set_variation);
+	ClassDB::bind_method(D_METHOD("get_variation", "tag"), &FontData::get_variation);
+
 	ClassDB::bind_method(D_METHOD("set_hinting", "hinting"), &FontData::set_hinting);
 	ClassDB::bind_method(D_METHOD("get_hinting"), &FontData::get_hinting);
 
@@ -115,6 +120,11 @@ bool FontData::_set(const StringName &p_name, const Variant &p_value) {
 		set_script_support_override(scr, p_value);
 		return true;
 	}
+	if (str.begins_with("variation/")) {
+		String name = str.get_slicec('/', 1);
+		set_variation(name, p_value);
+		return true;
+	}
 
 	return false;
 }
@@ -137,6 +147,12 @@ bool FontData::_get(const StringName &p_name, Variant &r_ret) const {
 		r_ret = get_script_support_override(scr);
 		return true;
 	}
+	if (str.begins_with("variation/")) {
+		String name = str.get_slicec('/', 1);
+
+		r_ret = get_variation(name);
+		return true;
+	}
 
 	return false;
 }
@@ -153,6 +169,12 @@ void FontData::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(PropertyInfo(Variant::BOOL, "script_support_override/" + scr_over[i], PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE));
 	}
 	p_list->push_back(PropertyInfo(Variant::NIL, "script_support_override/_new", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR));
+
+	Dictionary variations = get_variation_list();
+	for (const Variant *ftr = variations.next(nullptr); ftr != nullptr; ftr = variations.next(ftr)) {
+		Vector3i v = variations[*ftr];
+		p_list->push_back(PropertyInfo(Variant::FLOAT, "variation/" + TS->tag_to_name(*ftr), PROPERTY_HINT_RANGE, itos(v.x) + "," + itos(v.y), PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_STORAGE));
+	}
 }
 
 RID FontData::get_rid() const {
@@ -239,6 +261,26 @@ float FontData::get_underline_thickness(int p_size) const {
 	return TS->font_get_underline_thickness(rid, (p_size < 0) ? base_size : p_size);
 }
 
+Dictionary FontData::get_variation_list() const {
+	if (rid == RID()) {
+		return Dictionary();
+	}
+	return TS->font_get_variation_list(rid);
+}
+
+void FontData::set_variation(const String &p_name, double p_value) {
+	ERR_FAIL_COND(rid == RID());
+	TS->font_set_variation(rid, p_name, p_value);
+	emit_changed();
+}
+
+double FontData::get_variation(const String &p_name) const {
+	if (rid == RID()) {
+		return 0;
+	}
+	return TS->font_get_variation(rid, p_name);
+}
+
 void FontData::set_antialiased(bool p_antialiased) {
 	ERR_FAIL_COND(rid == RID());
 	TS->font_set_antialiased(rid, p_antialiased);
diff --git a/scene/resources/font.h b/scene/resources/font.h
index bc82a6fabf..fe28e1aea5 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -68,6 +68,10 @@ public:
 	float get_descent(int p_size) const;
 
 	Dictionary get_feature_list() const;
+	Dictionary get_variation_list() const;
+
+	void set_variation(const String &p_name, double p_value);
+	double get_variation(const String &p_name) const;
 
 	float get_underline_position(int p_size) const;
 	float get_underline_thickness(int p_size) const;