summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2016-06-07 16:59:16 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2016-06-07 16:59:16 +0100
commitd66b034bd1557bb8a3b8e29a1fa64b10b94e408c (patch)
tree150d65a03d59632aa4fe46ad076c066a3a982da9
parentce328ce99b6dd41862dea3c95aa8621dc4b83d15 (diff)
Improved breakpoint marker position, and scales with font size
-rw-r--r--scene/gui/text_edit.cpp9
-rw-r--r--tools/editor/plugins/script_editor_plugin.cpp1
2 files changed, 6 insertions, 4 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));
}
}
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 39b350eb4e..1833e3844a 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -588,7 +588,6 @@ void ScriptTextEditor::_bind_methods() {
}
ScriptTextEditor::ScriptTextEditor() {
- get_text_edit()->set_breakpoint_gutter_width(12);
}
/*** SCRIPT EDITOR ******/