diff options
| author | Poommetee Ketson <poommetee@protonmail.com> | 2017-09-17 08:55:13 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 08:55:13 +0700 |
| commit | d8ca7d44059472344a7e14346feae8e478486d3c (patch) | |
| tree | 0a665877fe46612c1b214e78e87fa52d00162ec5 /scene | |
| parent | 69f0d3b663321c4436e78efea224f8cd8008392b (diff) | |
| parent | ba11dc3f483e665ac3fd7b7decc5eb6f1c82baa2 (diff) | |
Merge pull request #11282 from djrm/pr_script_editor_auto_theme
Added adaptive text editor theme
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/text_edit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 1738e303aa..d9753de8b2 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "text_edit.h" +#include "editor/editor_scale.h" #include "message_queue.h" #include "os/input.h" #include "os/keyboard.h" @@ -729,15 +730,14 @@ void TextEdit::_notification(int p_what) { VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(xmargin_beg, ofs_y, xmargin_end - xmargin_beg, get_row_height()), cache.mark_color); } - 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); - } - 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); } + if (text.is_breakpoint(line) && !draw_breakpoint_gutter) { + VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(xmargin_beg, ofs_y + get_row_height() - EDSCALE, xmargin_end - xmargin_beg, EDSCALE), cache.breakpoint_color); + } + // draw breakpoint marker if (text.is_breakpoint(line)) { if (draw_breakpoint_gutter) { |