Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-25 02:43:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shader editor trims trailing whitespace if set in editor settings

Browse source
This commit is contained in:
Andreas Raddau 2023-03-09 17:27:23 +01:00
parent d3415ae5aa
commit 1566b402c1
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
editor/plugins/text_shader_editor.cpp
View file

@ -730,6 +730,8 @@ void TextShaderEditor::_editor_settings_changed() {
shader_editor->get_text_editor()->add_theme_constant_override("line_spacing", EDITOR_GET("text_editor/appearance/whitespace/line_spacing"));
shader_editor->get_text_editor()->set_draw_breakpoints_gutter(false);
shader_editor->get_text_editor()->set_draw_executing_lines_gutter(false);
trim_trailing_whitespace_on_save = EDITOR_GET("text_editor/behavior/files/trim_trailing_whitespace_on_save");
}
void TextShaderEditor::_show_warnings_panel(bool p_show) {
@ -890,6 +892,10 @@ void TextShaderEditor::save_external_data(const String &p_str) {
return;
}
if (trim_trailing_whitespace_on_save) {
trim_trailing_whitespace();
}
apply_shaders();
Ref<Shader> edited_shader = shader_editor->get_edited_shader();
@ -912,6 +918,10 @@ void TextShaderEditor::save_external_data(const String &p_str) {
disk_changed->hide();
}
void TextShaderEditor::trim_trailing_whitespace() {
shader_editor->trim_trailing_whitespace();
}
void TextShaderEditor::validate_script() {
shader_editor->_validate_script();
}
@ -1193,6 +1203,8 @@ TextShaderEditor::TextShaderEditor() {
disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
disk_changed->connect("custom_action", callable_mp(this, &TextShaderEditor::save_external_data));
trim_trailing_whitespace_on_save = EDITOR_GET("text_editor/behavior/files/trim_trailing_whitespace_on_save");
add_child(disk_changed);
_editor_settings_changed();