Skip to content

Commit 175d819

Browse files
committed
CodeEdit: Add line number gutter minimum digits
1 parent 2cb2c1f commit 175d819

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

doc/classes/CodeEdit.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@
562562
<member name="gutters_draw_line_numbers" type="bool" setter="set_draw_line_numbers" getter="is_draw_line_numbers_enabled" default="false">
563563
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.
564564
</member>
565+
<member name="gutters_line_numbers_min_digits" type="int" setter="set_line_numbers_min_digits" getter="get_line_numbers_min_digits" default="1">
566+
The minimum width in digits reserved for the line number gutter.
567+
</member>
565568
<member name="gutters_zero_pad_line_numbers" type="bool" setter="set_line_numbers_zero_padded" getter="is_line_numbers_zero_padded" default="false">
566569
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].
567570
</member>

editor/gui/code_editor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,6 +1895,7 @@ CodeTextEditor::CodeTextEditor() {
18951895
text_editor->set_v_size_flags(SIZE_EXPAND_FILL);
18961896
text_editor->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_GDSCRIPT);
18971897
text_editor->set_draw_bookmarks_gutter(true);
1898+
text_editor->set_line_numbers_min_digits(3);
18981899

18991900
text_editor->set_virtual_keyboard_show_on_focus(false);
19001901
text_editor->set_draw_line_numbers(true);

scene/gui/code_edit.cpp

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,6 +1511,26 @@ bool CodeEdit::is_line_numbers_zero_padded() const {
15111511
return line_number_padding == "0";
15121512
}
15131513

1514+
void CodeEdit::set_line_numbers_min_digits(int p_count) {
1515+
if (line_numbers_min_digits == p_count) {
1516+
return;
1517+
}
1518+
line_numbers_min_digits = p_count;
1519+
1520+
int digits = MAX(line_numbers_min_digits, std::log10(get_line_count()) + 1);
1521+
if (digits == line_number_digits) {
1522+
return;
1523+
}
1524+
line_number_digits = digits;
1525+
_clear_line_number_text_cache();
1526+
_update_line_number_gutter_width();
1527+
queue_redraw();
1528+
}
1529+
1530+
int CodeEdit::get_line_numbers_min_digits() const {
1531+
return line_numbers_min_digits;
1532+
}
1533+
15141534
void CodeEdit::_line_number_draw_callback(int p_line, int p_gutter, const Rect2 &p_region) {
15151535
if (!Rect2(Vector2(0, 0), get_size()).intersects(p_region)) {
15161536
return;
@@ -2800,6 +2820,8 @@ void CodeEdit::_bind_methods() {
28002820
ClassDB::bind_method(D_METHOD("is_draw_line_numbers_enabled"), &CodeEdit::is_draw_line_numbers_enabled);
28012821
ClassDB::bind_method(D_METHOD("set_line_numbers_zero_padded", "enable"), &CodeEdit::set_line_numbers_zero_padded);
28022822
ClassDB::bind_method(D_METHOD("is_line_numbers_zero_padded"), &CodeEdit::is_line_numbers_zero_padded);
2823+
ClassDB::bind_method(D_METHOD("set_line_numbers_min_digits", "count"), &CodeEdit::set_line_numbers_min_digits);
2824+
ClassDB::bind_method(D_METHOD("get_line_numbers_min_digits"), &CodeEdit::get_line_numbers_min_digits);
28032825

28042826
/* Fold Gutter */
28052827
ClassDB::bind_method(D_METHOD("set_draw_fold_gutter", "enable"), &CodeEdit::set_draw_fold_gutter);
@@ -2944,6 +2966,7 @@ void CodeEdit::_bind_methods() {
29442966

29452967
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_draw_line_numbers"), "set_draw_line_numbers", "is_draw_line_numbers_enabled");
29462968
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_zero_pad_line_numbers"), "set_line_numbers_zero_padded", "is_line_numbers_zero_padded");
2969+
ADD_PROPERTY(PropertyInfo(Variant::INT, "gutters_line_numbers_min_digits", PROPERTY_HINT_RANGE, "1,5,1"), "set_line_numbers_min_digits", "get_line_numbers_min_digits");
29472970

29482971
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gutters_draw_fold_gutter"), "set_draw_fold_gutter", "is_drawing_fold_gutter");
29492972

@@ -3823,7 +3846,7 @@ void CodeEdit::_text_changed() {
38233846
}
38243847

38253848
int lc = get_line_count();
3826-
int new_line_number_digits = std::log10(lc) + 1;
3849+
int new_line_number_digits = MAX(line_numbers_min_digits, std::log10(lc) + 1);
38273850
if (line_number_digits != new_line_number_digits) {
38283851
_clear_line_number_text_cache();
38293852
}

scene/gui/code_edit.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class CodeEdit : public TextEdit {
111111
/* Line numbers */
112112
int line_number_gutter = -1;
113113
int line_number_digits = 1;
114+
int line_numbers_min_digits = 1;
114115
String line_number_padding = " ";
115116
HashMap<int, RID> line_number_text_cache;
116117
void _clear_line_number_text_cache();
@@ -413,6 +414,8 @@ class CodeEdit : public TextEdit {
413414
bool is_draw_line_numbers_enabled() const;
414415
void set_line_numbers_zero_padded(bool p_zero_padded);
415416
bool is_line_numbers_zero_padded() const;
417+
void set_line_numbers_min_digits(int p_count);
418+
int get_line_numbers_min_digits() const;
416419

417420
/* Fold gutter */
418421
void set_draw_fold_gutter(bool p_draw);

0 commit comments

Comments
 (0)