Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a regression where horizontal text containers would sometimes not work correctly

Browse source
This commit is contained in:
Leon Styhre 2024-09-01 10:56:31 +02:00
parent 18eade57ad
commit 57a821e717
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/components/TextComponent.cpp
View file

@ -489,7 +489,8 @@ void TextComponent::onTextChanged()
(mSize.y - lineHeight) / 2.0f : (mSize.y - lineHeight) / 2.0f :
0.0f)}; 0.0f)};
const float length {mAutoCalcExtent.x ? 0.0f : mSize.x * mRelativeScale}; const float length {mAutoCalcExtent.x || mHorizontalScrolling ? 0.0f :
mSize.x * mRelativeScale};
const float height {mAutoCalcExtent.y ? 0.0f : (mSize.y * mRelativeScale) - lineHeight}; const float height {mAutoCalcExtent.y ? 0.0f : (mSize.y * mRelativeScale) - lineHeight};
const Alignment horizontalAlignment {mHorizontalScrolling ? ALIGN_LEFT : mHorizontalAlignment}; const Alignment horizontalAlignment {mHorizontalScrolling ? ALIGN_LEFT : mHorizontalAlignment};
const bool multiLine {mAutoCalcExtent.y == 1 || mSize.y > lineHeight}; const bool multiLine {mAutoCalcExtent.y == 1 || mSize.y > lineHeight};