RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(ui): handle max lines and line height in CSimpleFontString::GetDisplayText

Browse Source
This commit is contained in:
fallenoak 2025-10-06 16:07:06 -05:00
parent 9c6e52fcc3
commit 0a74642732
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/CSimpleFontString.cpp
View File

@ -142,14 +142,18 @@ const char* CSimpleFontString::GetDisplayText(float width, float height) {
return nullptr;
}
if (!this->m_font || width <= 0.0f || /* TODO */ height <= 0.0f) {
if (!this->m_font || width <= 0.0f || (this->m_maxLines == 0 && height <= 0.0)) {
return this->m_text;
}
auto fontHeight = this->GetFontHeight(true);
auto v5 = (CSimpleTop::RoundToPixelHeight(this->m_spacing) + fontHeight) * this->m_layoutScale;
auto lineHeight = (CSimpleTop::RoundToPixelHeight(this->m_spacing) + fontHeight) * this->m_layoutScale;
// TODO
if (this->m_maxLines != 0) {
height = lineHeight * this->m_maxLines;
} else if (lineHeight >= height) {
height = lineHeight;
}
auto text = this->m_text;
auto textLen = SStrLen(text);