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

Fixed an issue where the textlist selector would not get sized correctly.

Browse source
This commit is contained in:
Leon Styhre 2022-10-25 20:34:58 +02:00
parent a8d1c4a2e1
commit 18bbd97433
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,11 +489,10 @@ template <typename T> void TextListComponent<T>::render(const glm::mat4& parentT
// Currently selected item text might be looping. // Currently selected item text might be looping.
if (mCursor == i && mLoopOffset1 > 0) { if (mCursor == i && mLoopOffset1 > 0) {
drawTrans = glm::translate( drawTrans = glm::translate(
drawTrans, drawTrans, offset - glm::vec3 {static_cast<float>(mLoopOffset1), 0.0f, 0.0f});
glm::round(offset - glm::vec3 {static_cast<float>(mLoopOffset1), 0.0f, 0.0f}));
} }
else { else {
drawTrans = glm::translate(drawTrans, glm::round(offset)); drawTrans = glm::translate(drawTrans, offset);
} }
// Needed to avoid flickering when returning to the start position. // Needed to avoid flickering when returning to the start position.
@ -508,8 +507,7 @@ template <typename T> void TextListComponent<T>::render(const glm::mat4& parentT
mLoopScroll = true; mLoopScroll = true;
drawTrans = trans; drawTrans = trans;
drawTrans = glm::translate( drawTrans = glm::translate(
drawTrans, drawTrans, offset - glm::vec3 {static_cast<float>(mLoopOffset2), 0.0f, 0.0f});
glm::round(offset - glm::vec3 {static_cast<float>(mLoopOffset2), 0.0f, 0.0f}));
mRenderer->setMatrix(drawTrans); mRenderer->setMatrix(drawTrans);
font->renderTextCache(entry.data.textCache.get()); font->renderTextCache(entry.data.textCache.get());
} }
@ -567,7 +565,7 @@ void TextListComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
setFont(Font::getFromTheme(elem, properties, mFont, 0.0f, mLegacyMode)); setFont(Font::getFromTheme(elem, properties, mFont, 0.0f, mLegacyMode));
const float selectorHeight {mFont->getSize() * mLineSpacing}; const float selectorHeight {mFont->getHeight(mLineSpacing)};
setSelectorHeight(selectorHeight); setSelectorHeight(selectorHeight);
if (properties & ALIGNMENT) { if (properties & ALIGNMENT) {