Просмотр исходного кода

Merge pull request #59373 from bruvzg/fix_editor_font_change

[Editor] Fix reloading editor theme on font / font size setting change.
Rémi Verschelde 3 лет назад
Родитель
Сommit
49176bc0fc
2 измененных файлов с 5 добавлено и 2 удалено
  1. 4 1
      editor/editor_node.cpp
  2. 1 1
      editor/editor_settings.cpp

+ 4 - 1
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());

+ 1 - 1
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", "");