diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-06 11:33:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 11:33:43 +0100 |
| commit | a2a4ec7cb582650ed0cb70b33e9d954e288d1513 (patch) | |
| tree | 08188e981503aad93ea0fa9158fe103ac403184f /editor | |
| parent | b2382183635acb4117d6b88eaffa8fd841052f10 (diff) | |
| parent | fe283fd07aa7682faf21b252c24c67f0497dc928 (diff) | |
Merge pull request #56376 from pycbouh/theme-tombe-les-theme-properties
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_fonts.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_themes.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 827eb76db5..d556255a8f 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -273,8 +273,8 @@ void editor_register_fonts(Ref<Theme> p_theme) { // Default font MAKE_DEFAULT_FONT(df, String()); - p_theme->set_default_theme_font(df); // Default theme font - p_theme->set_default_theme_font_size(default_font_size); + p_theme->set_default_font(df); // Default theme font + p_theme->set_default_font_size(default_font_size); p_theme->set_font_size("main_size", "EditorFonts", default_font_size); p_theme->set_font("main", "EditorFonts", df); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 7b60c4a384..a8a1dc37ab 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -294,7 +294,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { Ref<Theme> theme = Ref<Theme>(memnew(Theme)); // Controls may rely on the scale for their internal drawing logic. - theme->set_default_theme_base_scale(EDSCALE); + theme->set_default_base_scale(EDSCALE); // Theme settings Color accent_color = EDITOR_GET("interface/theme/accent_color"); |