summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2018-12-17 22:31:02 +0100
committerHein-Pieter van Braam <hp@tmm.cx>2018-12-17 22:31:02 +0100
commitc58b1608ea81af0327d846e8537f5821444241e0 (patch)
treeb9efd707ad0620a6b8cb8db933e0a09e3b532d29 /scene
parentcf0716952db45acf7d7430552f2759c57e0d876e (diff)
Don't accidentally convert string content to char
Due to the right hand side of the :? trickery the rhs was cast to a char losing precision. Previously this didn't matter, but with CharProxy it does. (Previously we could just happily cast it back to a wchar_t and get the original 16 - 32 bits. Now we'll only ever get the first 8).
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/label.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index a7f88514e0..1b7196c402 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -395,7 +395,7 @@ void Label::regenerate_word_cache() {
for (int i = 0; i <= xl_text.length(); i++) {
- CharType current = i < xl_text.length() ? xl_text[i] : ' '; //always a space at the end, so the algo works
+ CharType current = i < xl_text.length() ? xl_text[i] : L' '; //always a space at the end, so the algo works
if (uppercase)
current = String::char_uppercase(current);