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 DateTimeEditComponent would not center vertically.

Browse source
This commit is contained in:
Leon Styhre 2022-10-27 19:09:45 +02:00
parent 3e9ddde2f3
commit e36041669d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
es-core/src/components/DateTimeEditComponent.cpp
View file

@ -169,18 +169,18 @@ void DateTimeEditComponent::render(const glm::mat4& parentTrans)
glm::mat4 trans {parentTrans * getTransform()}; glm::mat4 trans {parentTrans * getTransform()};
if (mTextCache) { if (mTextCache) {
std::shared_ptr<Font> font = getFont(); std::shared_ptr<Font> font {getFont()};
float referenceSize {0.0f}; float referenceSize {0.0f};
if (mAlignRight) if (mAlignRight)
referenceSize = std::round(mParent->getSize().x * 0.1045f); referenceSize = mParent->getSize().x * 0.1045f;
// Vertically center. // Vertically center.
glm::vec3 off {0.0f, (mSize.y - mTextCache->metrics.size.y) / 2.0f, 0.0f}; glm::vec3 off {0.0f, (mSize.y - mTextCache->metrics.size.y) / 2.0f, 0.0f};
if (mAlignRight) if (mAlignRight)
off.x += referenceSize - mTextCache->metrics.size.x; off.x += referenceSize - mTextCache->metrics.size.x;
trans = glm::translate(trans, glm::round(off)); trans = glm::translate(trans, off);
mRenderer->setMatrix(trans); mRenderer->setMatrix(trans);
@ -276,8 +276,8 @@ std::string DateTimeEditComponent::getDisplayString(DisplayMode mode) const
if (mTime.getTime() == 0) if (mTime.getTime() == 0)
return "never"; return "never";
Utils::Time::DateTime now(Utils::Time::now()); Utils::Time::DateTime now {Utils::Time::now()};
Utils::Time::Duration dur(now.getTime() - mTime.getTime()); Utils::Time::Duration dur {now.getTime() - mTime.getTime()};
std::string buf; std::string buf;
@ -295,7 +295,7 @@ std::string DateTimeEditComponent::getDisplayString(DisplayMode mode) const
" second" + (dur.getSeconds() > 1 || dur.getSeconds() == 0 ? "s" : "") + " second" + (dur.getSeconds() > 1 || dur.getSeconds() == 0 ? "s" : "") +
" ago"; " ago";
return std::string(buf); return buf;
break; break;
} }
} }
@ -355,7 +355,7 @@ void DateTimeEditComponent::changeDate()
void DateTimeEditComponent::updateTextCache() void DateTimeEditComponent::updateTextCache()
{ {
DisplayMode mode = getCurrentDisplayMode(); DisplayMode mode {getCurrentDisplayMode()};
std::string dispString; std::string dispString;
@ -369,6 +369,8 @@ void DateTimeEditComponent::updateTextCache()
mUppercase ? Utils::String::toUpper(getDisplayString(mode)) : getDisplayString(mode); mUppercase ? Utils::String::toUpper(getDisplayString(mode)) : getDisplayString(mode);
} }
std::shared_ptr<Font> font = getFont(); std::shared_ptr<Font> font = getFont();
// Used to initialize all glyphs, which is needed to populate mMaxGlyphHeight.
font->loadGlyphs(dispString + "\n");
mTextCache = std::unique_ptr<TextCache>(font->buildTextCache(dispString, 0, 0, mColor)); mTextCache = std::unique_ptr<TextCache>(font->buildTextCache(dispString, 0, 0, mColor));
if (mAutoSize) { if (mAutoSize) {