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

Fixed a cosmetic issue with the ROM directory setup dialog caused by an optimization.

Browse source
This commit is contained in:
Leon Styhre 2021-12-26 17:07:57 +01:00
parent 52f36c6a2a
commit 246e9ae8be
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
es-core/src/guis/GuiMsgBox.cpp
View file

@ -13,6 +13,7 @@
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#define HORIZONTAL_PADDING_PX 20.0f #define HORIZONTAL_PADDING_PX 20.0f
#define VERTICAL_PADDING_MODIFIER 1.225f
GuiMsgBox::GuiMsgBox(Window* window, GuiMsgBox::GuiMsgBox(Window* window,
const HelpStyle& helpstyle, const HelpStyle& helpstyle,
@ -86,8 +87,8 @@ GuiMsgBox::GuiMsgBox(Window* window,
// Now that we know width, we can find height. // Now that we know width, we can find height.
mMsg->setSize(width, 0.0f); // mMsg->getSize.y() now returns the proper length. mMsg->setSize(width, 0.0f); // mMsg->getSize.y() now returns the proper length.
const float msgHeight = const float msgHeight = std::max(Font::get(FONT_SIZE_LARGE)->getHeight(),
std::max(Font::get(FONT_SIZE_LARGE)->getHeight(), mMsg->getSize().y * 1.225f); mMsg->getSize().y * VERTICAL_PADDING_MODIFIER);
setSize(width + HORIZONTAL_PADDING_PX * 2.0f * Renderer::getScreenWidthModifier(), setSize(width + HORIZONTAL_PADDING_PX * 2.0f * Renderer::getScreenWidthModifier(),
msgHeight + mButtonGrid->getSize().y); msgHeight + mButtonGrid->getSize().y);
@ -102,7 +103,9 @@ GuiMsgBox::GuiMsgBox(Window* window,
void GuiMsgBox::changeText(const std::string& newText) void GuiMsgBox::changeText(const std::string& newText)
{ {
mMsg->setText(newText); mMsg->setText(newText);
mMsg->setSize(mMsg->getFont()->sizeText(newText)); glm::vec2 newSize = mMsg->getFont()->sizeText(newText);
newSize.y *= VERTICAL_PADDING_MODIFIER;
mMsg->setSize(newSize);
// Adjust the width depending on the aspect ratio of the screen, to make the screen look // Adjust the width depending on the aspect ratio of the screen, to make the screen look
// somewhat coherent regardless of screen type. The 1.778 aspect ratio value is the 16:9 // somewhat coherent regardless of screen type. The 1.778 aspect ratio value is the 16:9
@ -124,9 +127,12 @@ void GuiMsgBox::changeText(const std::string& newText)
} }
// Now that we know width, we can find height. // Now that we know width, we can find height.
mMsg->setSize(width, 0); // mMsg->getSize.y() now returns the proper length. mMsg->setSize(width, 0); // mMsg->getSize.y() now returns the proper height.
const float msgHeight = newSize = mMsg->getSize();
std::max(Font::get(FONT_SIZE_LARGE)->getHeight(), mMsg->getSize().y * 1.225f); newSize.y *= VERTICAL_PADDING_MODIFIER;
mMsg->setSize(newSize);
const float msgHeight = std::max(Font::get(FONT_SIZE_LARGE)->getHeight(), mMsg->getSize().y);
setSize(width + HORIZONTAL_PADDING_PX * 2.0f * Renderer::getScreenWidthModifier(), setSize(width + HORIZONTAL_PADDING_PX * 2.0f * Renderer::getScreenWidthModifier(),
msgHeight + mButtonGrid->getSize().y); msgHeight + mButtonGrid->getSize().y);
} }