Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-01 14:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45942 from YeldhamDev/label_height_empty

Browse Source 
Keep Label's min height when empty
This commit is contained in:
Rémi Verschelde 2021-02-14 13:10:54 +01:00 committed by GitHub
commit 6fb1ed2bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/label.cpp
View File

@ -357,21 +357,25 @@ void Label::_notification(int p_what) {
}
Size2 Label::get_minimum_size() const {
Size2 min_style = get_theme_stylebox("normal")->get_minimum_size();
// don't want to mutable everything
if (dirty || lines_dirty) {
const_cast<Label *>(this)->_shape();
}
Size2 min_size = minsize;
Ref<Font> font = get_theme_font("font");
min_size.height = MAX(min_size.height, font->get_height(get_theme_font_size("font_size")) + font->get_spacing(Font::SPACING_TOP) + font->get_spacing(Font::SPACING_BOTTOM));
Size2 min_style = get_theme_stylebox("normal")->get_minimum_size();
if (autowrap) {
return Size2(1, clip ? 1 : minsize.height) + min_style;
return Size2(1, clip ? 1 : min_size.height) + min_style;
} else {
Size2 ms = minsize;
if (clip) {
ms.width = 1;
min_size.width = 1;
}
return ms + min_style;
return min_size + min_style;
}
}