asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #88742 from MajorMcDoom/text-editor-zoom

Browse source 
Fix the text editor theme not being applied on editor start
This commit is contained in:
Rémi Verschelde 2024-02-27 10:17:47 +01:00
commit e770a38d00
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/code_editor.cpp
View file

@ -1059,7 +1059,6 @@ void CodeTextEditor::update_editor_settings() {
text_editor->set_line_length_guidelines(TypedArray<int>()); text_editor->set_line_length_guidelines(TypedArray<int>());
} }
_update_font_ligatures();
set_zoom_factor(zoom_factor); set_zoom_factor(zoom_factor);
} }
@ -1683,10 +1682,6 @@ void CodeTextEditor::goto_error() {
} }
void CodeTextEditor::_update_text_editor_theme() { void CodeTextEditor::_update_text_editor_theme() {
if (!EditorThemeManager::is_generated_theme_outdated()) {
return;
}
emit_signal(SNAME("load_theme_settings")); emit_signal(SNAME("load_theme_settings"));
error_button->set_icon(get_editor_theme_icon(SNAME("StatusError"))); error_button->set_icon(get_editor_theme_icon(SNAME("StatusError")));

4
editor/plugins/script_editor_plugin.cpp
View file

@ -60,6 +60,7 @@
#include "editor/plugins/shader_editor_plugin.h" #include "editor/plugins/shader_editor_plugin.h"
#include "editor/plugins/text_shader_editor.h" #include "editor/plugins/text_shader_editor.h"
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "editor/themes/editor_theme_manager.h"
#include "editor/window_wrapper.h" #include "editor/window_wrapper.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/window.h" #include "scene/main/window.h"
@ -2784,7 +2785,8 @@ void ScriptEditor::_save_layout() {
} }
void ScriptEditor::_editor_settings_changed() { 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("text_editor") &&
!EditorSettings::get_singleton()->check_changed_settings_in_group("docks/filesystem")) { !EditorSettings::get_singleton()->check_changed_settings_in_group("docks/filesystem")) {
return; return;

4
editor/plugins/text_shader_editor.cpp
View file

@ -37,6 +37,7 @@
#include "editor/filesystem_dock.h" #include "editor/filesystem_dock.h"
#include "editor/project_settings_editor.h" #include "editor/project_settings_editor.h"
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "editor/themes/editor_theme_manager.h"
#include "scene/gui/split_container.h" #include "scene/gui/split_container.h"
#include "servers/rendering/shader_preprocessor.h" #include "servers/rendering/shader_preprocessor.h"
#include "servers/rendering/shader_types.h" #include "servers/rendering/shader_types.h"
@ -740,7 +741,8 @@ void TextShaderEditor::_notification(int p_what) {
} }
void TextShaderEditor::_editor_settings_changed() { 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")) { !EditorSettings::get_singleton()->check_changed_settings_in_group("text_editor")) {
return; return;
} }