CodeEdit: Add line number gutter minimum digits

Author: timothyqiu

doc/classes/CodeEdit.xml

@@ -562,6 +562,9 @@
 		<member name="gutters_draw_line_numbers" type="bool" setter="set_draw_line_numbers" getter="is_draw_line_numbers_enabled" default="false">
 			If [code]true[/code], the line number gutter is drawn. Line numbers start at [code]1[/code] and are incremented for each line of text. Clicking and dragging in the line number gutter will select entire lines of text.
 		</member>
+		<member name="gutters_line_numbers_min_digits" type="int" setter="set_line_numbers_min_digits" getter="get_line_numbers_min_digits" default="1">
+			The minimum width in digits reserved for the line number gutter.
+		</member>
 		<member name="gutters_zero_pad_line_numbers" type="bool" setter="set_line_numbers_zero_padded" getter="is_line_numbers_zero_padded" default="false">
 			If [code]true[/code], line numbers drawn in the gutter are zero padded based on the total line count. Requires [member gutters_draw_line_numbers] to be set to [code]true[/code].
 		</member>

doc/classes/EditorSettings.xml

@@ -1280,6 +1280,9 @@
 		<member name="text_editor/appearance/gutters/highlight_type_safe_lines" type="bool" setter="" getter="">
 			If [code]true[/code], highlights type-safe lines by displaying their line number color with [member text_editor/theme/highlighting/safe_line_number_color] instead of [member text_editor/theme/highlighting/line_number_color]. Type-safe lines are lines of code where the type of all variables is known at compile-time. These type-safe lines may run faster thanks to typed instructions.
 		</member>
+		<member name="text_editor/appearance/gutters/line_numbers_min_digits" type="int" setter="" getter="">
+			The minimum width in digits reserved for the line number gutter.
+		</member>
 		<member name="text_editor/appearance/gutters/line_numbers_zero_padded" type="bool" setter="" getter="">
 			If [code]true[/code], displays line numbers with zero padding (e.g. [code]007[/code] instead of [code]7[/code]).
 		</member>

editor/gui/code_editor.cpp

@@ -1119,6 +1119,7 @@ void CodeTextEditor::update_editor_settings() {
 	// Appearance: Gutters
 	text_editor->set_draw_line_numbers(EDITOR_GET("text_editor/appearance/gutters/show_line_numbers"));
 	text_editor->set_line_numbers_zero_padded(EDITOR_GET("text_editor/appearance/gutters/line_numbers_zero_padded"));
+	text_editor->set_line_numbers_min_digits(EDITOR_GET("text_editor/appearance/gutters/line_numbers_min_digits"));
 
 	// Appearance: Minimap
 	text_editor->set_draw_minimap(EDITOR_GET("text_editor/appearance/minimap/show_minimap"));

editor/settings/editor_settings.cpp

@@ -761,6 +761,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	// Appearance: Gutters
 	_initial_set("text_editor/appearance/gutters/show_line_numbers", true, true);
 	_initial_set("text_editor/appearance/gutters/line_numbers_zero_padded", false, true);
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/appearance/gutters/line_numbers_min_digits", 2, "1,10,1,or_greater");
 	_initial_set("text_editor/appearance/gutters/highlight_type_safe_lines", true, true);
 	_initial_set("text_editor/appearance/gutters/show_info_gutter", true, true);
 

scene/gui/code_edit.cpp

@@ -1511,6 +1511,26 @@ bool CodeEdit::is_line_numbers_zero_padded() const {
 	return line_number_padding == "0";
 }
 
+void CodeEdit::set_line_numbers_min_digits(int p_count) {
+	if (line_numbers_min_digits == p_count) {
+		return;
+	}
+	line_numbers_min_digits = p_count;
+
+	int digits = MAX(line_numbers_min_digits, std::log10(get_line_count()) + 1);
+	if (digits == line_number_digits) {
+		return;
+	}
+	line_number_digits = digits;
+	_clear_line_number_text_cache();
+	_update_line_number_gutter_width();
+	queue_redraw();
+}
+
+int CodeEdit::get_line_numbers_min_digits() const {
+	return line_numbers_min_digits;
+}
+
 void CodeEdit::_line_number_draw_callback(int p_line, int p_gutter, const Rect2 &p_region) {
 	if (!Rect2(Vector2(0, 0), get_size()).intersects(p_region)) {
 		return;
@@ -2800,6 +2820,8 @@ void CodeEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_draw_line_numbers_enabled"), &CodeEdit::is_draw_line_numbers_enabled);
 	ClassDB::bind_method(D_METHOD("set_line_numbers_zero_padded", "enable"), &CodeEdit::set_line_numbers_zero_padded);
 	ClassDB::bind_method(D_METHOD("is_line_numbers_zero_padded"), &CodeEdit::is_line_numbers_zero_padded);
+	ClassDB::bind_method(D_METHOD("set_line_numbers_min_digits", "count"), &CodeEdit::set_line_numbers_min_digits);
+	ClassDB::bind_method(D_METHOD("get_line_numbers_min_digits"), &CodeEdit::get_line_numbers_min_digits);
 
 	/* Fold Gutter */
 	ClassDB::bind_method(D_METHOD("set_draw_fold_gutter", "enable"), &CodeEdit::set_draw_fold_gutter);
@@ -2944,6 +2966,7 @@ void CodeEdit::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_draw_line_numbers"), "set_draw_line_numbers", "is_draw_line_numbers_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_zero_pad_line_numbers"), "set_line_numbers_zero_padded", "is_line_numbers_zero_padded");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "gutters_line_numbers_min_digits", PROPERTY_HINT_RANGE, "1,10,1,or_greater"), "set_line_numbers_min_digits", "get_line_numbers_min_digits");
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_draw_fold_gutter"), "set_draw_fold_gutter", "is_drawing_fold_gutter");
 
@@ -3823,7 +3846,7 @@ void CodeEdit::_text_changed() {
 	}
 
 	int lc = get_line_count();
-	int new_line_number_digits = std::log10(lc) + 1;
+	int new_line_number_digits = MAX(line_numbers_min_digits, std::log10(lc) + 1);
 	if (line_number_digits != new_line_number_digits) {
 		_clear_line_number_text_cache();
 	}

scene/gui/code_edit.h

@@ -111,6 +111,7 @@ class CodeEdit : public TextEdit {
 	/* Line numbers */
 	int line_number_gutter = -1;
 	int line_number_digits = 1;
+	int line_numbers_min_digits = 1;
 	String line_number_padding = " ";
 	HashMap<int, RID> line_number_text_cache;
 	void _clear_line_number_text_cache();
@@ -413,6 +414,8 @@ class CodeEdit : public TextEdit {
 	bool is_draw_line_numbers_enabled() const;
 	void set_line_numbers_zero_padded(bool p_zero_padded);
 	bool is_line_numbers_zero_padded() const;
+	void set_line_numbers_min_digits(int p_count);
+	int get_line_numbers_min_digits() const;
 
 	/* Fold gutter */
 	void set_draw_fold_gutter(bool p_draw);