diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-08 07:55:29 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-08 07:55:29 -0300 |
| commit | 32fa1e3ee6f94d6bc1fc5aaa604c7461428f63f3 (patch) | |
| tree | ba954c03da89042fd09c1c54db7754b159b544f3 /scene/gui | |
| parent | 1b3fd498a33151a1029a3235bb77e3c6bcb81a64 (diff) | |
| parent | d66b034bd1557bb8a3b8e29a1fa64b10b94e408c (diff) | |
Merge pull request #5088 from Paulb23/breakpoint_marker_scaling
Improved breakpoint marker position, and scales with font size
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index fe03b34105..18ee93ade1 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -420,6 +420,7 @@ void TextEdit::_notification(int p_what) { case NOTIFICATION_DRAW: { if (draw_breakpoint_gutter) { + breakpoint_gutter_width = (get_row_height() * 55) / 100; cache.breakpoint_gutter_width = breakpoint_gutter_width; } else { cache.breakpoint_gutter_width = 0; @@ -720,10 +721,12 @@ void TextEdit::_notification(int p_what) { // 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; + int vertical_gap = (get_row_height() * 40) / 100; + int horizontal_gap = (cache.breakpoint_gutter_width * 30) / 100; + int marker_height = get_row_height() - (vertical_gap * 2); + int marker_width = cache.breakpoint_gutter_width - (horizontal_gap * 2); // no transparency on marker - VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cache.style_normal->get_margin(MARGIN_LEFT) + 1, ofs_y + vertical_gap ,marker_size, marker_size),Color(cache.breakpoint_color.r, cache.breakpoint_color.g, cache.breakpoint_color.b)); + VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cache.style_normal->get_margin(MARGIN_LEFT) + horizontal_gap - 2, ofs_y + vertical_gap ,marker_width, marker_height),Color(cache.breakpoint_color.r, cache.breakpoint_color.g, cache.breakpoint_color.b)); } } |