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

Improved breakpoint marker position, and scales with font size 

(cherry picked from commit d66b034bd1)
This commit is contained in:
Paulb23 2016-06-07 16:59:16 +01:00 committed by Rémi Verschelde
parent d16375d005
commit afbc9d550f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/text_edit.cpp
View File

@ -420,6 +420,7 @@ void TextEdit::_notification(int p_what) {
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
if (draw_breakpoint_gutter) { if (draw_breakpoint_gutter) {
breakpoint_gutter_width = (get_row_height() * 55) / 100;
cache.breakpoint_gutter_width = breakpoint_gutter_width; cache.breakpoint_gutter_width = breakpoint_gutter_width;
} else { } else {
cache.breakpoint_gutter_width = 0; cache.breakpoint_gutter_width = 0;
@ -716,10 +717,12 @@ void TextEdit::_notification(int p_what) {
// draw breakpoint marker // draw breakpoint marker
if (text.is_breakpoint(line)) { if (text.is_breakpoint(line)) {
if (draw_breakpoint_gutter) { if (draw_breakpoint_gutter) {
int vertical_gap = cache.breakpoint_gutter_width / 2; int vertical_gap = (get_row_height() * 40) / 100;
int marker_size = cache.breakpoint_gutter_width - vertical_gap; 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 // 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));
} }
} }

1
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -584,7 +584,6 @@ void ScriptTextEditor::_bind_methods() {
} }
ScriptTextEditor::ScriptTextEditor() { ScriptTextEditor::ScriptTextEditor() {
get_text_edit()->set_breakpoint_gutter_width(12);
} }
/*** SCRIPT EDITOR ******/ /*** SCRIPT EDITOR ******/