godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Remove redundant line_spacing editor setting

Browse Source
This commit is contained in:
RedMser
2025-05-07 00:17:01 +02:00
parent 6a6a1168a5
commit 4acdc7a657
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@@ -1560,9 +1560,6 @@
<member name="text_editor/theme/highlighting/word_highlighted_color" type="Color" setter="" getter=""> <member name="text_editor/theme/highlighting/word_highlighted_color" type="Color" setter="" getter="">
The script editor's color for words highlighted by selecting them. Only visible if [member text_editor/appearance/caret/highlight_all_occurrences] is [code]true[/code]. The script editor's color for words highlighted by selecting them. Only visible if [member text_editor/appearance/caret/highlight_all_occurrences] is [code]true[/code].
</member> </member>
<member name="text_editor/theme/line_spacing" type="int" setter="" getter="">
The vertical line separation used in text editors, in pixels.
</member>
<member name="version_control/ssh_private_key_path" type="String" setter="" getter=""> <member name="version_control/ssh_private_key_path" type="String" setter="" getter="">
Path to private SSH key file for the editor's Version Control integration credentials. Path to private SSH key file for the editor's Version Control integration credentials.
</member> </member>

2
editor/editor_native_shader_source_visualizer.cpp
View File

@@ -98,7 +98,7 @@ void EditorNativeShaderSourceVisualizer::_inspect_shader(RID p_shader) {
code_edit->set_syntax_highlighter(syntax_highlighter); code_edit->set_syntax_highlighter(syntax_highlighter);
code_edit->add_theme_font_override(SceneStringName(font), get_theme_font("source", EditorStringName(EditorFonts))); code_edit->add_theme_font_override(SceneStringName(font), get_theme_font("source", EditorStringName(EditorFonts)));
code_edit->add_theme_font_size_override(SceneStringName(font_size), get_theme_font_size("source_size", EditorStringName(EditorFonts))); code_edit->add_theme_font_size_override(SceneStringName(font_size), get_theme_font_size("source_size", EditorStringName(EditorFonts)));
code_edit->add_theme_constant_override("line_spacing", EDITOR_GET("text_editor/theme/line_spacing")); code_edit->add_theme_constant_override("line_spacing", EDITOR_GET("text_editor/appearance/whitespace/line_spacing"));
// Appearance: Caret // Appearance: Caret
code_edit->set_caret_type((TextEdit::CaretType)EDITOR_GET("text_editor/appearance/caret/type").operator int()); code_edit->set_caret_type((TextEdit::CaretType)EDITOR_GET("text_editor/appearance/caret/type").operator int());

2
editor/editor_settings.cpp
View File

@@ -676,7 +676,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
/* Text editor */ /* Text editor */
// Theme // Theme
_initial_set("text_editor/theme/line_spacing", 6);
EDITOR_SETTING_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "text_editor/theme/color_theme", "Default", "Default,Godot 2,Custom") EDITOR_SETTING_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "text_editor/theme/color_theme", "Default", "Default,Godot 2,Custom")
// Theme: Highlighting // Theme: Highlighting
@@ -1220,6 +1219,7 @@ void EditorSettings::_remove_deprecated_settings() {
erase("network/connection/engine_version_update_mode"); erase("network/connection/engine_version_update_mode");
erase("run/output/always_open_output_on_play"); erase("run/output/always_open_output_on_play");
erase("run/output/always_close_output_on_stop"); erase("run/output/always_close_output_on_stop");
erase("text_editor/theme/line_spacing"); // See GH-106137.
} }
#endif #endif