maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #22255 from guilhermefelipecgs/fix_label_min_size

Browse source 
Fix Label::get_minimum_size not updating cache size for autowrap
This commit is contained in:
Rémi Verschelde 2018-09-19 20:04:11 +02:00 committed by GitHub
parent b1187b9a2f b0b88df016
commit 7adaad1c64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/gui/label.cpp
View file

@ -295,14 +295,13 @@ Size2 Label::get_minimum_size() const {
Size2 min_style = get_stylebox("normal")->get_minimum_size();
// don't want to mutable everything
if (word_cache_dirty)
const_cast<Label *>(this)->regenerate_word_cache();
if (autowrap)
return Size2(1, clip ? 1 : minsize.height) + min_style;
else {
// don't want to mutable everything
if (word_cache_dirty)
const_cast<Label *>(this)->regenerate_word_cache();
Size2 ms = minsize;
if (clip)
ms.width = 1;