1 files changed, 31 insertions, 25 deletions

diff --git a/scene/resources/theme.h b/scene/resources/theme.h
index d170d53ae3..51e0ec4b1b 100644
--- a/scene/resources/theme.h
+++ b/scene/resources/theme.h
@@ -101,16 +101,16 @@ protected:
 	static Ref<Theme> project_default_theme;
 
 	// Universal default values, final fallback for every theme.
-	static float default_base_scale;
-	static Ref<Texture2D> default_icon;
-	static Ref<StyleBox> default_style;
-	static Ref<Font> default_font;
-	static int default_font_size;
+	static float fallback_base_scale;
+	static Ref<Texture2D> fallback_icon;
+	static Ref<StyleBox> fallback_style;
+	static Ref<Font> fallback_font;
+	static int fallback_font_size;
 
 	// Default values configurable for each individual theme.
-	float default_theme_base_scale = 0.0;
-	Ref<Font> default_theme_font;
-	int default_theme_font_size = -1;
+	float default_base_scale = 0.0;
+	Ref<Font> default_font;
+	int default_font_size = -1;
 
 	static void _bind_methods();
 
@@ -126,23 +126,29 @@ public:
 	static Ref<Theme> get_project_default();
 	static void set_project_default(const Ref<Theme> &p_project_default);
 
-	static void set_default_base_scale(float p_base_scale);
-	static void set_default_icon(const Ref<Texture2D> &p_icon);
-	static void set_default_style(const Ref<StyleBox> &p_style);
-	static void set_default_font(const Ref<Font> &p_font);
-	static void set_default_font_size(int p_font_size);
-
-	void set_default_theme_base_scale(float p_base_scale);
-	float get_default_theme_base_scale() const;
-	bool has_default_theme_base_scale() const;
-
-	void set_default_theme_font(const Ref<Font> &p_default_font);
-	Ref<Font> get_default_theme_font() const;
-	bool has_default_theme_font() const;
-
-	void set_default_theme_font_size(int p_font_size);
-	int get_default_theme_font_size() const;
-	bool has_default_theme_font_size() const;
+	static void set_fallback_base_scale(float p_base_scale);
+	static void set_fallback_icon(const Ref<Texture2D> &p_icon);
+	static void set_fallback_style(const Ref<StyleBox> &p_style);
+	static void set_fallback_font(const Ref<Font> &p_font);
+	static void set_fallback_font_size(int p_font_size);
+
+	static float get_fallback_base_scale();
+	static Ref<Texture2D> get_fallback_icon();
+	static Ref<StyleBox> get_fallback_style();
+	static Ref<Font> get_fallback_font();
+	static int get_fallback_font_size();
+
+	void set_default_base_scale(float p_base_scale);
+	float get_default_base_scale() const;
+	bool has_default_base_scale() const;
+
+	void set_default_font(const Ref<Font> &p_default_font);
+	Ref<Font> get_default_font() const;
+	bool has_default_font() const;
+
+	void set_default_font_size(int p_font_size);
+	int get_default_font_size() const;
+	bool has_default_font_size() const;
 
 	void set_icon(const StringName &p_name, const StringName &p_theme_type, const Ref<Texture2D> &p_icon);
 	Ref<Texture2D> get_icon(const StringName &p_name, const StringName &p_theme_type) const;