asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #6780 from RandomShaper/space-padded-line-numbers

Browse source 
Allow turning off zero-padding for line numbers
This commit is contained in:
Rémi Verschelde 2016-10-14 18:09:28 +02:00 committed by GitHub
commit 44e0071d0f
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/text_edit.cpp
View file

@ -693,6 +693,8 @@ void TextEdit::_notification(int p_what) {
// get the highlighted words // get the highlighted words
String highlighted_text = get_selection_text(); String highlighted_text = get_selection_text();
String line_num_padding = line_numbers_zero_padded ? "0" : " ";
for (int i=0;i<visible_rows;i++) { for (int i=0;i<visible_rows;i++) {
int line=i+cursor.line_ofs; int line=i+cursor.line_ofs;
@ -758,7 +760,7 @@ void TextEdit::_notification(int p_what) {
if (cache.line_number_w) { if (cache.line_number_w) {
String fc = String::num(line+1); String fc = String::num(line+1);
while (fc.length() < line_number_char_count) { while (fc.length() < line_number_char_count) {
fc="0"+fc; fc=line_num_padding+fc;
} }
cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT)+cache.breakpoint_gutter_width,ofs_y+cache.font->get_ascent()),fc,cache.line_number_color); cache.font->draw(ci,Point2(cache.style_normal->get_margin(MARGIN_LEFT)+cache.breakpoint_gutter_width,ofs_y+cache.font->get_ascent()),fc,cache.line_number_color);
@ -4520,6 +4522,12 @@ void TextEdit::set_show_line_numbers(bool p_show) {
update(); update();
} }
void TextEdit::set_line_numbers_zero_padded(bool p_zero_padded) {
line_numbers_zero_padded=p_zero_padded;
update();
}
bool TextEdit::is_show_line_numbers_enabled() const { bool TextEdit::is_show_line_numbers_enabled() const {
return line_numbers; return line_numbers;
} }
@ -4811,6 +4819,7 @@ TextEdit::TextEdit() {
completion_line_ofs=0; completion_line_ofs=0;
tooltip_obj=NULL; tooltip_obj=NULL;
line_numbers=false; line_numbers=false;
line_numbers_zero_padded=false;
line_length_guideline=false; line_length_guideline=false;
line_length_guideline_col=80; line_length_guideline_col=80;
draw_breakpoint_gutter=false; draw_breakpoint_gutter=false;

3
scene/gui/text_edit.h
View file

@ -232,6 +232,7 @@ class TextEdit : public Control {
bool text_changed_dirty; bool text_changed_dirty;
bool undo_enabled; bool undo_enabled;
bool line_numbers; bool line_numbers;
bool line_numbers_zero_padded;
bool line_length_guideline; bool line_length_guideline;
int line_length_guideline_col; int line_length_guideline_col;
bool draw_breakpoint_gutter; bool draw_breakpoint_gutter;
@ -489,6 +490,8 @@ public:
void set_show_line_numbers(bool p_show); void set_show_line_numbers(bool p_show);
bool is_show_line_numbers_enabled() const; bool is_show_line_numbers_enabled() const;
void set_line_numbers_zero_padded(bool p_zero_padded);
void set_show_line_length_guideline(bool p_show); void set_show_line_length_guideline(bool p_show);
void set_line_length_guideline_column(int p_column); void set_line_length_guideline_column(int p_column);

1
tools/editor/code_editor.cpp
View file

@ -1112,6 +1112,7 @@ void CodeTextEditor::update_editor_settings() {
text_editor->set_tab_size(EditorSettings::get_singleton()->get("text_editor/tab_size")); text_editor->set_tab_size(EditorSettings::get_singleton()->get("text_editor/tab_size"));
text_editor->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/draw_tabs")); text_editor->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/draw_tabs"));
text_editor->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/show_line_numbers")); text_editor->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/show_line_numbers"));
text_editor->set_line_numbers_zero_padded(EditorSettings::get_singleton()->get("text_editor/line_numbers_zero_padded"));
text_editor->set_show_line_length_guideline(EditorSettings::get_singleton()->get("text_editor/show_line_length_guideline")); text_editor->set_show_line_length_guideline(EditorSettings::get_singleton()->get("text_editor/show_line_length_guideline"));
text_editor->set_line_length_guideline_column(EditorSettings::get_singleton()->get("text_editor/line_length_guideline_column")); text_editor->set_line_length_guideline_column(EditorSettings::get_singleton()->get("text_editor/line_length_guideline_column"));
text_editor->set_syntax_coloring(EditorSettings::get_singleton()->get("text_editor/syntax_highlighting")); text_editor->set_syntax_coloring(EditorSettings::get_singleton()->get("text_editor/syntax_highlighting"));

2
tools/editor/editor_settings.cpp
View file

@ -546,6 +546,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
hints["text_editor/tab_size"]=PropertyInfo(Variant::INT,"text_editor/tab_size",PROPERTY_HINT_RANGE,"1, 64, 1"); // size of 0 crashes. hints["text_editor/tab_size"]=PropertyInfo(Variant::INT,"text_editor/tab_size",PROPERTY_HINT_RANGE,"1, 64, 1"); // size of 0 crashes.
set("text_editor/draw_tabs", true); set("text_editor/draw_tabs", true);
set("text_editor/line_numbers_zero_padded", false);
set("text_editor/show_line_numbers", true); set("text_editor/show_line_numbers", true);
set("text_editor/show_breakpoint_gutter", true); set("text_editor/show_breakpoint_gutter", true);