From 40f258f0f409ceeed86a3938180e22e537ddadb9 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 29 Jul 2023 20:27:36 +0200 Subject: [PATCH] Improved font rendering for BusyComponent and GuiInfoPopup --- es-core/src/components/BusyComponent.cpp | 2 +- es-core/src/guis/GuiInfoPopup.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/es-core/src/components/BusyComponent.cpp b/es-core/src/components/BusyComponent.cpp index 98dcbaf7e..98e761198 100644 --- a/es-core/src/components/BusyComponent.cpp +++ b/es-core/src/components/BusyComponent.cpp @@ -43,7 +43,7 @@ void BusyComponent::onSizeChanged() mGrid.setColWidthPerc(2, middleSpacerWidth / mSize.x); mGrid.setColWidthPerc(3, textWidth / mSize.x); - mGrid.setRowHeightPerc(1, textHeight / std::round(mSize.y)); + mGrid.setRowHeightPerc(1, mText->getFont()->getLetterHeight() / mSize.y); mBackground.setCornerSize({16.0f * Renderer::getScreenResolutionModifier(), 16.0f * Renderer::getScreenResolutionModifier()}); diff --git a/es-core/src/guis/GuiInfoPopup.cpp b/es-core/src/guis/GuiInfoPopup.cpp index d8842e738..c242e75b5 100644 --- a/es-core/src/guis/GuiInfoPopup.cpp +++ b/es-core/src/guis/GuiInfoPopup.cpp @@ -61,9 +61,10 @@ GuiInfoPopup::GuiInfoPopup(std::string message, int duration) // We only initialize the actual time when we first start to render. mStartTime = 0; - mGrid = new ComponentGrid(glm::ivec2 {1, 1}); + mGrid = new ComponentGrid(glm::ivec2 {1, 3}); + mGrid->setEntry(s, glm::ivec2 {0, 1}, false, true); + mGrid->setRowHeightPerc(1, s->getSize().y / mSize.y); mGrid->setSize(mSize); - mGrid->setEntry(s, glm::ivec2 {0, 0}, false, true); addChild(mGrid); }