Skip to content

Commit 3b12bd0

Browse files
committed
Merge pull request godotengine#106137 from RedMser/remove-unused-linespacing-setting
Remove redundant `line_spacing` editor setting
2 parents 658ee70 + 4acdc7a commit 3b12bd0

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

doc/classes/EditorSettings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,9 +1560,6 @@
15601560
<member name="text_editor/theme/highlighting/word_highlighted_color" type="Color" setter="" getter="">
15611561
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].
15621562
</member>
1563-
<member name="text_editor/theme/line_spacing" type="int" setter="" getter="">
1564-
The vertical line separation used in text editors, in pixels.
1565-
</member>
15661563
<member name="version_control/ssh_private_key_path" type="String" setter="" getter="">
15671564
Path to private SSH key file for the editor's Version Control integration credentials.
15681565
</member>

editor/editor_native_shader_source_visualizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void EditorNativeShaderSourceVisualizer::_inspect_shader(RID p_shader) {
9898
code_edit->set_syntax_highlighter(syntax_highlighter);
9999
code_edit->add_theme_font_override(SceneStringName(font), get_theme_font("source", EditorStringName(EditorFonts)));
100100
code_edit->add_theme_font_size_override(SceneStringName(font_size), get_theme_font_size("source_size", EditorStringName(EditorFonts)));
101-
code_edit->add_theme_constant_override("line_spacing", EDITOR_GET("text_editor/theme/line_spacing"));
101+
code_edit->add_theme_constant_override("line_spacing", EDITOR_GET("text_editor/appearance/whitespace/line_spacing"));
102102

103103
// Appearance: Caret
104104
code_edit->set_caret_type((TextEdit::CaretType)EDITOR_GET("text_editor/appearance/caret/type").operator int());

editor/editor_settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
676676
/* Text editor */
677677

678678
// Theme
679-
_initial_set("text_editor/theme/line_spacing", 6);
680679
EDITOR_SETTING_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "text_editor/theme/color_theme", "Default", "Default,Godot 2,Custom")
681680

682681
// Theme: Highlighting
@@ -1220,6 +1219,7 @@ void EditorSettings::_remove_deprecated_settings() {
12201219
erase("network/connection/engine_version_update_mode");
12211220
erase("run/output/always_open_output_on_play");
12221221
erase("run/output/always_close_output_on_stop");
1222+
erase("text_editor/theme/line_spacing"); // See GH-106137.
12231223
}
12241224
#endif
12251225

0 commit comments

Comments
 (0)