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

fix(ui): avoid potential null pointer issue in CSimpleButton::SetFontString

Browse Source
This commit is contained in:
fallenoak 2025-12-01 16:36:08 -06:00
parent 25780ae857
commit a9364386d8
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ui/CSimpleButton.cpp
View File

@ -491,28 +491,21 @@ void CSimpleButton::SetFontString(CSimpleFontString* text) {
if (text) { if (text) {
text->SetFrame(this, DRAWLAYER_ARTWORK, 1); text->SetFrame(this, DRAWLAYER_ARTWORK, 1);
}
if (!text->Sub482AC0()) { if (!text->Sub482AC0()) {
auto font = this->m_normalFont; auto font = this->m_normalFont;
uint32_t styleFlags = font ? font->m_attributes.m_styleFlags : 0x0;
int32_t styleFlags; float offsetX = 0.0f;
float offsetY = 0.0f;
if (font) { if (styleFlags & 0x1) {
styleFlags = font->m_attributes.m_styleFlags; text->SetPoint(FRAMEPOINT_LEFT, this, FRAMEPOINT_LEFT, offsetX, offsetY, 1);
} else { } else if (styleFlags & 0x4) {
styleFlags = 0; text->SetPoint(FRAMEPOINT_RIGHT, this, FRAMEPOINT_RIGHT, offsetX, offsetY, 1);
} } else {
text->SetPoint(FRAMEPOINT_CENTER, this, FRAMEPOINT_CENTER, offsetX, offsetY, 1);
float offsetX = 0.0f; }
float offsetY = 0.0f;
if (styleFlags & 0x1) {
text->SetPoint(FRAMEPOINT_LEFT, this, FRAMEPOINT_LEFT, offsetX, offsetY, 1);
} else if (styleFlags & 0x4) {
text->SetPoint(FRAMEPOINT_RIGHT, this, FRAMEPOINT_RIGHT, offsetX, offsetY, 1);
} else {
text->SetPoint(FRAMEPOINT_CENTER, this, FRAMEPOINT_CENTER, offsetX, offsetY, 1);
} }
} }