Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 15:15:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where the rows in TextListComponent were not always sized correctly vertically

Browse source
This commit is contained in:
Leon Styhre 2023-08-21 17:00:15 +02:00
parent de905babf0
commit 5ddad6d55e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-core/src/components/primary/TextListComponent.h
View file

@ -198,7 +198,8 @@ void TextListComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeDat
entry.data.entryName = std::make_shared<TextComponent>(
mHorizontalScrolling ? entry.name :
mFont->wrapText(entry.name, mSize.x - mHorizontalMargin * 2.0f),
mFont, 0x000000FF);
mFont, 0x000000FF, ALIGN_LEFT, ALIGN_CENTER, glm::vec3 {0.0f, 0.0f, 0.0f},
glm::vec2 {mFont->sizeText(entry.name).x, mFont->getSize() * 1.5f});
if (mHorizontalScrolling) {
glm::vec2 textSize {entry.data.entryName->getSize()};
@ -504,9 +505,6 @@ void TextListComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
mFont = Font::getFromTheme(elem, properties, mFont, 0.0f, false);
const float selectorHeight {mFont->getHeight(mLineSpacing)};
mSelectorHeight = selectorHeight;
if (properties & ALIGNMENT) {
if (elem->has("horizontalAlignment")) {
const std::string& horizontalAlignment {elem->get<std::string>("horizontalAlignment")};
@ -602,6 +600,8 @@ void TextListComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("selectorHeight"))
mSelectorHeight = glm::clamp(elem->get<float>("selectorHeight"), 0.0f, 1.0f) *
Renderer::getScreenHeight();
else
mSelectorHeight = mFont->getSize() * 1.5f;
if (elem->has("selectorHorizontalOffset")) {
const float scale {this->mParent ? this->mParent->getSize().x :
Renderer::getScreenWidth()};