From ce434bca825b2ffc5c5fe3f7884ca21d863ddbf8 Mon Sep 17 00:00:00 2001
From: ianb96
Date: Tue, 15 May 2018 15:32:09 -0400
Subject: fix get_char_width for non-latin characters

---
 scene/gui/text_edit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scene/gui/text_edit.cpp')

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 553c2b7c3..34365d012 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -302,7 +302,7 @@ void TextEdit::Text::remove(int p_at) {
 	text.remove(p_at);
 }
 
-int TextEdit::Text::get_char_width(char c, char next_c, int px) const {
+int TextEdit::Text::get_char_width(CharType c, CharType next_c, int px) const {
 
 	int tab_w = font->get_char_size(' ').width * indent_size;
 	int w = 0;
@@ -3620,7 +3620,7 @@ void TextEdit::adjust_viewport_to_cursor() {
 		visible_width -= v_scroll->get_combined_minimum_size().width;
 	visible_width -= 20; // give it a little more space
 
-	if (is_wrap_enabled()) {
+	if (!is_wrap_enabled()) {
 		// adjust x offset
 		int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]);
 
-- 
cgit v1.2.3-70-g09d2