asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug where leading and trailing spaces werent taken into account with center and right allignment.

Browse source 
(cherry picked from commit 4318ad94ac)
This commit is contained in:
mvl 2020-07-24 01:42:40 +02:00 committed by Rémi Verschelde
parent 76a8458753
commit be13df0a08
No known key found for this signature in database
GPG key ID: C3336907360768E1
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

@ -191,7 +191,7 @@ void Label::_notification(int p_what) {
while (to && to->char_pos >= 0) {
taken += to->pixel_width;
if (to != from && to->space_count) {
if (to->space_count) {
spaces += to->space_count;
}
to = to->next;
@ -438,6 +438,22 @@ void Label::regenerate_word_cache() {
wc->space_count = space_count;
current_word_size = 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') {