diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-21 08:34:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 08:34:09 +0100 |
| commit | 49176bc0fca3341a13a6919210999af16d686313 (patch) | |
| tree | e9257642df1f71a4ec27188808fa1bfa96a80ced | |
| parent | d77d85d23e0400722920872892592c36b36f5cb9 (diff) | |
| parent | f80148e3d11f4ec323526598f64bcb8658bad2ef (diff) | |
Merge pull request #59373 from bruvzg/fix_editor_font_change
[Editor] Fix reloading editor theme on font / font size setting change.
| -rw-r--r-- | editor/editor_node.cpp | 5 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index d01dfb5361..bf118b8e16 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -707,7 +707,10 @@ void EditorNode::_notification(int p_what) { bool theme_changed = EditorSettings::get_singleton()->check_changed_settings_in_group("interface/theme") || - EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/theme"); + EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor/theme") || + EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/font") || + EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/main_font") || + EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/code_font"); if (theme_changed) { theme = create_custom_theme(theme_base->get_theme()); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index d4581ffb09..08cc957ec7 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -409,7 +409,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { // Use pseudolocalization in editor. EDITOR_SETTING_USAGE(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/editor/custom_display_scale", 1.0, "0.5,3,0.01", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) - EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/main_font_size", 14, "8,48,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/main_font_size", 14, "8,48,1") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/editor/code_font_size", 14, "8,48,1") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/code_font_contextual_ligatures", 0, "Default,Disable Contextual Alternates (Coding Ligatures),Use Custom OpenType Feature Set") _initial_set("interface/editor/code_font_custom_opentype_features", ""); |