From 7928b5fef61a6cdb52cb2529001e4ecf74fc1cdd Mon Sep 17 00:00:00 2001 From: Paulb23 Date: Mon, 30 May 2016 16:28:31 +0100 Subject: [PATCH] Current line draws behind line numbers and breakpont gutter (cherry picked from commit 6ae126ef9b2d654dc3575aea18bbb280992e0bc5) --- scene/gui/text_edit.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index dacaf0573ab..f75e986a974 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -696,15 +696,6 @@ void TextEdit::_notification(int p_what) { 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& cri_map=text.get_color_region_info(line); @@ -716,8 +707,14 @@ void TextEdit::_notification(int p_what) { 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); + } - // 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) { int vertical_gap = cache.breakpoint_gutter_width / 2; int marker_size = cache.breakpoint_gutter_width - vertical_gap; @@ -727,10 +724,13 @@ void TextEdit::_notification(int p_what) { } - if (line==cursor.line) { - - VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(xmargin_beg, ofs_y,xmargin_end-xmargin_beg,get_row_height()),cache.current_line_color); + 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); } for (int j=0;j