diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 09:24:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 09:24:20 +0200 |
| commit | 25166f565df295ee4e261118c3f7bd516a7d738d (patch) | |
| tree | 8bf28ad0c56f50bbe5be0e29f7efcc60a60ce006 | |
| parent | b9783f44c00d86c9e79153ae52649e20f60ea7eb (diff) | |
| parent | 9cf689183d31fd57a5cc6074ed49375d02cc3041 (diff) | |
Merge pull request #22500 from elasota/fix-textedit-wchar-wrap
Fix some wchar_t truncations in TextEdit
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 64567a3d0f..632a686256 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3794,7 +3794,7 @@ Vector<String> TextEdit::get_wrap_rows_text(int p_line) const { int tab_offset_px = get_indent_level(p_line) * cache.font->get_char_size(' ').width; while (col < line_text.length()) { - char c = line_text[col]; + CharType c = line_text[col]; int w = text.get_char_width(c, line_text[col + 1], px + word_px); int indent_ofs = (cur_wrap_index != 0 ? tab_offset_px : 0); @@ -5864,7 +5864,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const { if (select_word(s, col, beg, end)) { bool inside_quotes = false; - char selected_quote = '\0'; + CharType selected_quote = '\0'; int qbegin = 0, qend = 0; for (int i = 0; i < s.length(); i++) { if (s[i] == '"' || s[i] == '\'') { |