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

Merge pull request #40649 from themvl/master

Browse Source 
Fix bug where leading and trailing spaces werent taken into account with center and right allignment
This commit is contained in:
Rémi Verschelde 2020-09-05 12:38:26 +02:00 committed by GitHub
commit ff9195a905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/label.cpp
View File

@ -188,7 +188,7 @@ void Label::_notification(int p_what) {
int spaces = 0; int spaces = 0;
while (to && to->char_pos >= 0) { while (to && to->char_pos >= 0) {
taken += to->pixel_width; taken += to->pixel_width;
if (to != from && to->space_count) { if (to->space_count) {
spaces += to->space_count; spaces += to->space_count;
} }
to = to->next; to = to->next;
@ -420,6 +420,22 @@ void Label::regenerate_word_cache() {
wc->space_count = space_count; wc->space_count = space_count;
current_word_size = 0; current_word_size = 0;
space_count = 0; space_count = 0;
} else if ((i == xl_text.length() || current == '\n') && last != nullptr && space_count != 0) {
//in case there are trailing white spaces we add a placeholder word cache with just the spaces
WordCache *wc = memnew(WordCache);
if (word_cache) {
last->next = wc;
} else {
word_cache = wc;
}
last = wc;
wc->pixel_width = 0;
wc->char_pos = 0;
wc->word_len = 0;
wc->space_count = space_count;
current_word_size = 0;
space_count = 0;
} }
if (current == '\n') { if (current == '\n') {