diff options
| author | Juan Linietsky | 2015-05-07 20:02:54 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-07 20:02:54 -0300 |
| commit | c99813dc38cc79b37529cdd98dc2bc2c3ff69edc (patch) | |
| tree | 99ea11d3829bf296ea23941a83ebc61158028087 /scene/gui/label.cpp | |
| parent | 7156aff16041ea56ff1f3aea2a622c130bcca7a9 (diff) | |
| parent | ac9263c680076eed36887a681cb59fdcce6c6f73 (diff) | |
| download | godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.tar.gz godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.tar.zst godot-c99813dc38cc79b37529cdd98dc2bc2c3ff69edc.zip | |
Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
Diffstat (limited to 'scene/gui/label.cpp')
| -rw-r--r-- | scene/gui/label.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 1751d335e..dac21275d 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -433,7 +433,7 @@ void Label::regenerate_word_cache() { } - if ((autowrap && line_width>=width && (last && last->char_pos >= 0 || not_latin)) || insert_newline) { + if ((autowrap && (line_width >= width) && ((last && last->char_pos >= 0) || not_latin)) || insert_newline) { if (not_latin) { if (current_word_size>0) { WordCache *wc = memnew( WordCache ); |