godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Current line draws behind line numbers and breakpont gutter 

(cherry picked from commit 6ae126ef9b)
This commit is contained in:
Paulb23 2016-05-30 16:28:31 +01:00 committed by Rémi Verschelde
parent 8b8a1a0cbb
commit 7928b5fef6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/gui/text_edit.cpp
View File

@ -696,15 +696,6 @@ void TextEdit::_notification(int p_what) {
highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, 0); highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, 0);
} }
if (cache.line_number_w) {
String fc = String::num(line+1);
while (fc.length() < line_number_char_count) {
fc="0"+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);
}
const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(line); const Map<int,Text::ColorRegionInfo>& cri_map=text.get_color_region_info(line);
@ -716,8 +707,14 @@ void TextEdit::_notification(int p_what) {
if (text.is_breakpoint(line)) { if (text.is_breakpoint(line)) {
VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.breakpoint_color); VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.breakpoint_color);
}
// draw breakpoint marker if (line==cursor.line) {
VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(0, ofs_y,xmargin_end,get_row_height()),cache.current_line_color);
}
// draw breakpoint marker
if (text.is_breakpoint(line)) {
if (draw_breakpoint_gutter) { if (draw_breakpoint_gutter) {
int vertical_gap = cache.breakpoint_gutter_width / 2; int vertical_gap = cache.breakpoint_gutter_width / 2;
int marker_size = cache.breakpoint_gutter_width - vertical_gap; int marker_size = cache.breakpoint_gutter_width - vertical_gap;
@ -727,10 +724,13 @@ void TextEdit::_notification(int p_what) {
} }
if (line==cursor.line) { if (cache.line_number_w) {
String fc = String::num(line+1);
VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.current_line_color); while (fc.length() < line_number_char_count) {
fc="0"+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);
} }
for (int j=0;j<str.length();j++) { for (int j=0;j<str.length();j++) {