diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-08 17:53:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-08 17:53:51 -0300 |
| commit | 225a1b26f46850e5bc4f6f217d60c397afa1df3c (patch) | |
| tree | 69a6889424ded4820073ca3940f7e472e1daf4b5 /scene/gui/text_edit.cpp | |
| parent | 40ba22631bbb7fc4c6b88d01402e132dbaceaf2b (diff) | |
| parent | 515567d491a6045a8786366f6bb85ab391aa681b (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index cf60ec1daf..7f7c8c023c 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -839,7 +839,7 @@ void TextEdit::_notification(int p_what) { } - if (cursor.column==str.length() && cursor.line==line) { + if (cursor.column==str.length() && cursor.line==line && (char_ofs+char_margin)>=xmargin_beg) { cursor_pos=Point2i( char_ofs+char_margin, ofs_y ); VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color); |