From cff11113590fd49d015be68dbcd021a002d5f6cb Mon Sep 17 00:00:00 2001 From: jsjtxietian Date: Tue, 7 May 2024 14:18:48 +0800 Subject: [PATCH] Make native shader source visualizer can highlight uint suffix --- editor/editor_native_shader_source_visualizer.cpp | 2 ++ editor/plugins/text_shader_editor.cpp | 2 +- scene/resources/syntax_highlighter.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/editor/editor_native_shader_source_visualizer.cpp b/editor/editor_native_shader_source_visualizer.cpp index 0e3e44bb7e3a..d87f17f22aac 100644 --- a/editor/editor_native_shader_source_visualizer.cpp +++ b/editor/editor_native_shader_source_visualizer.cpp @@ -66,6 +66,8 @@ void EditorNativeShaderSourceVisualizer::_load_theme_settings() { // Colorize preprocessor statements. const Color user_type_color = EDITOR_GET("text_editor/theme/highlighting/user_type_color"); syntax_highlighter->add_color_region("#", "", user_type_color, true); + + syntax_highlighter->set_uint_suffix_enabled(true); } void EditorNativeShaderSourceVisualizer::_inspect_shader(RID p_shader) { diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp index a1d1df0f837c..22a475900f1b 100644 --- a/editor/plugins/text_shader_editor.cpp +++ b/editor/plugins/text_shader_editor.cpp @@ -335,7 +335,7 @@ void ShaderTextEditor::_load_theme_settings() { warnings_panel->add_theme_font_size_override("normal_font_size", EditorNode::get_singleton()->get_editor_theme()->get_font_size(SNAME("main_size"), EditorStringName(EditorFonts))); } - syntax_highlighter->set_uint_suffix_enabled(); + syntax_highlighter->set_uint_suffix_enabled(true); } void ShaderTextEditor::_check_shader_mode() { diff --git a/scene/resources/syntax_highlighter.h b/scene/resources/syntax_highlighter.h index bc66f434d416..02afd9045e7c 100644 --- a/scene/resources/syntax_highlighter.h +++ b/scene/resources/syntax_highlighter.h @@ -142,7 +142,7 @@ public: void set_member_variable_color(Color p_color); Color get_member_variable_color() const; - void set_uint_suffix_enabled(bool p_enabled = true); + void set_uint_suffix_enabled(bool p_enabled); }; #endif // SYNTAX_HIGHLIGHTER_H