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

Fixed a text string abbreviation issue in GuiComplexTextEditPopup.

Browse source
This commit is contained in:
Leon Styhre 2021-01-16 19:22:23 +01:00
parent b95a04311b
commit 3c0f62b1be
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-core/src/components/TextComponent.cpp
View file

@ -218,7 +218,7 @@ void TextComponent::onTextChanged()
std::string text = mUppercase ? Utils::String::toUpper(mText) : mText;
std::shared_ptr<Font> f = mFont;
const bool isMultiline = (mSize.y() == 0 || mSize.y() > f->getHeight()*1.2f);
const bool isMultiline = (mSize.y() == 0 || mSize.y() > f->getHeight() * 1.2f);
bool addAbbrev = false;
if (!isMultiline) {

15
es-core/src/guis/GuiComplexTextEditPopup.cpp
View file

@ -49,18 +49,13 @@ GuiComplexTextEditPopup::GuiComplexTextEditPopup(
Font::get(FONT_SIZE_MEDIUM), 0x555555FF, ALIGN_CENTER);
mInfoString1 = std::make_shared<TextComponent>(mWindow, infoString1,
Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER);
if (infoString2.size() > 92)
mInfoString2 = std::make_shared<TextComponent>(mWindow, infoString2.substr(0 ,90) + "...",
Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER);
else
mInfoString2 = std::make_shared<TextComponent>(mWindow, infoString2,
Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER);
mInfoString2 = std::make_shared<TextComponent>(mWindow, infoString2,
Font::get(FONT_SIZE_SMALL), 0x555555FF, ALIGN_CENTER);
mText = std::make_shared<TextEditComponent>(mWindow);
mText->setValue(initValue);
std::vector< std::shared_ptr<ButtonComponent> > buttons;
std::vector<std::shared_ptr<ButtonComponent>> buttons;
buttons.push_back(std::make_shared<ButtonComponent>(mWindow, acceptBtnText, acceptBtnText,
[this, okCallback] {
okCallback(mText->getValue());
@ -82,7 +77,7 @@ GuiComplexTextEditPopup::GuiComplexTextEditPopup(
mGrid.setEntry(mTitle, Vector2i(0, 0), false, true);
mGrid.setEntry(mInfoString1, Vector2i(0, 1), false, true);
mGrid.setEntry(mInfoString2, Vector2i(0, 2), false, true);
mGrid.setEntry(mInfoString2, Vector2i(0, 2), false, false);
mGrid.setEntry(mText, Vector2i(0, 3), true, false, Vector2i(1, 1),
GridFlags::BORDER_TOP | GridFlags::BORDER_BOTTOM);
mGrid.setEntry(mButtonGrid, Vector2i(0, 4), true, false);
@ -92,7 +87,9 @@ GuiComplexTextEditPopup::GuiComplexTextEditPopup(
if (multiLine)
textHeight *= 6;
mText->setSize(0, textHeight);
mInfoString2->setSize(Renderer::getScreenWidth() * 0.70f, mInfoString2->getFont()->getHeight());
setSize(Renderer::getScreenWidth() * 0.75f, mTitle->getFont()->getHeight() +
textHeight + mButtonGrid->getSize().y() + mButtonGrid->getSize().y() * 1.85f);