godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-30 18:30:54 +00:00
Code Releases Wiki Activity

Merge pull request #112602 from bruvzg/lbl_max

Browse Source 
[Label] Account for max visible lines when trimming text.
This commit is contained in:
Rémi Verschelde
2025-12-18 14:23:38 +01:00
parent 823cb065ce d0b2b8616e
commit 4be81ddf44
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/label.cpp
View File

@@ -982,7 +982,13 @@ Size2 Label::get_minimum_size() const {
Size2 min_style = theme_cache.normal_style->get_minimum_size();
if (autowrap_mode != TextServer::AUTOWRAP_OFF) {
return Size2(1, (clip || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) ? 1 : min_size.height) + min_style;
if (!clip && overrun_behavior != TextServer::OVERRUN_NO_TRIMMING && max_lines_visible > 0) {
int line_spacing = settings.is_valid() ? settings->get_line_spacing() : theme_cache.line_spacing;
min_size.height = MIN(min_size.height, (font->get_height(font_size) + line_spacing) * max_lines_visible);
} else if (clip || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) {
min_size.height = 1;
}
return Size2(1, min_size.height) + min_style;
} else {
if (clip || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) {
min_size.width = 1;