Fixed the text editor theme not being applied on editor start.

godotengine · Feb 25, 2024 · ea401f9 · ea401f9
1 parent 2e7fc81
commit ea401f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
@@ -1059,7 +1059,6 @@ void CodeTextEditor::update_editor_settings() {
 		text_editor->set_line_length_guidelines(TypedArray<int>());
 	}
 
-	_update_font_ligatures();
 	set_zoom_factor(zoom_factor);
 }
 
@@ -1683,10 +1682,6 @@ void CodeTextEditor::goto_error() {
 }
 
 void CodeTextEditor::_update_text_editor_theme() {
-	if (!EditorThemeManager::is_generated_theme_outdated()) {
-		return;
-	}
-
 	emit_signal(SNAME("load_theme_settings"));
 
 	error_button->set_icon(get_editor_theme_icon(SNAME("StatusError")));

diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
@@ -60,6 +60,7 @@
 #include "editor/plugins/shader_editor_plugin.h"
 #include "editor/plugins/text_shader_editor.h"
 #include "editor/themes/editor_scale.h"
+#include "editor/themes/editor_theme_manager.h"
 #include "editor/window_wrapper.h"
 #include "scene/main/node.h"
 #include "scene/main/window.h"
@@ -2787,7 +2788,8 @@ void ScriptEditor::_save_layout() {
 }
 
 void ScriptEditor::_editor_settings_changed() {
-	if (!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") &&
+	if (!EditorThemeManager::is_generated_theme_outdated() &&
+			!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") &&
 			!EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor") &&
 			!EditorSettings::get_singleton()->check_changed_settings_in_group("docks/filesystem")) {
 		return;

diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp
@@ -37,6 +37,7 @@
 #include "editor/filesystem_dock.h"
 #include "editor/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
+#include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/split_container.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
@@ -740,7 +741,8 @@ void TextShaderEditor::_notification(int p_what) {
 }
 
 void TextShaderEditor::_editor_settings_changed() {
-	if (!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") &&
+	if (!EditorThemeManager::is_generated_theme_outdated() &&
+			!EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor") &&
 			!EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor")) {
 		return;
 	}