diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 15:45:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 15:45:31 +0100 |
| commit | 92d25e62f76864c782b702976cd1687f15afcd1d (patch) | |
| tree | 7ae77be40c8ef299d1f7f948f3deea6523af9fb7 | |
| parent | 9a7dbc2acafdd04ff0fe09bc5f4838b4920348a8 (diff) | |
| parent | 21c211674417e80a67bf1a5bc2abaebfe67fdc33 (diff) | |
Merge pull request #37353 from bruvzg/fix_editor_font
Fix default editor font.
| -rw-r--r-- | editor/editor_fonts.cpp | 2 | ||||
| -rw-r--r-- | scene/main/window.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 171b7a2176..8aadf02ea6 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -231,7 +231,7 @@ void editor_register_fonts(Ref<Theme> p_theme) { // Default font MAKE_DEFAULT_FONT(df, default_font_size); - p_theme->set_default_theme_font(df); + p_theme->set_font("font", "Node", df); // Default theme font p_theme->set_font("main", "EditorFonts", df); // Bold font diff --git a/scene/main/window.cpp b/scene/main/window.cpp index a2a49aea75..b22b99c50c 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -1331,7 +1331,7 @@ void Window::_bind_methods() { ClassDB::bind_method(D_METHOD("popup_on_parent", "parent_rect"), &Window::popup_on_parent); ClassDB::bind_method(D_METHOD("popup_centered_ratio", "ratio"), &Window::popup_centered_ratio, DEFVAL(0.8)); ClassDB::bind_method(D_METHOD("popup_centered", "minsize"), &Window::popup_centered, DEFVAL(Size2i())); - ClassDB::bind_method(D_METHOD("popup_centered_clamped", "minsize", "fallback_ratio"), &Window::popup_centered, DEFVAL(Size2i()), DEFVAL(0.75)); + ClassDB::bind_method(D_METHOD("popup_centered_clamped", "minsize", "fallback_ratio"), &Window::popup_centered_clamped, DEFVAL(Size2i()), DEFVAL(0.75)); ADD_PROPERTY(PropertyInfo(Variant::STRING, "title"), "set_title", "get_title"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "position"), "set_position", "get_position"); |