seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #77280 from Rindbee/fix-unnecessary-break-in-Label

Browse Source 
Fix unnecessary break when calculating the height of visible lines
This commit is contained in:
Rémi Verschelde
2023-08-02 12:15:24 +02:00
parent df616c9a17 e5bebbc9ff
commit b156e24216
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/label.cpp
View File

@ -299,9 +299,6 @@ void Label::_update_visible() {
int last_line = MIN(lines_rid.size(), lines_visible + lines_skipped); int last_line = MIN(lines_rid.size(), lines_visible + lines_skipped);
for (int64_t i = lines_skipped; i < last_line; i++) { for (int64_t i = lines_skipped; i < last_line; i++) {
minsize.height += TS->shaped_text_get_size(lines_rid[i]).y + line_spacing; minsize.height += TS->shaped_text_get_size(lines_rid[i]).y + line_spacing;
if (minsize.height > (get_size().height - style->get_minimum_size().height + line_spacing)) {
break;
}
} }
if (minsize.height > 0) { if (minsize.height > 0) {
minsize.height -= line_spacing; minsize.height -= line_spacing;