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

Fix crash when no fast-select font specified

Browse source
This commit is contained in:
Aloshi 2013-07-09 18:52:10 -05:00
parent 40dc9abdf8
commit a15031733b
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/GuiFastSelect.cpp
View file

@ -41,11 +41,14 @@ void GuiFastSelect::render()
mBox->render(); mBox->render();
mTheme->getFastSelectFont()->drawCenteredText(LETTERS.substr(mLetterID, 1), 0, (int)(sh * 0.5f - (mTheme->getFastSelectFont()->getHeight() * 0.5f)), mTextColor); std::shared_ptr<Font> letterFont = mTheme->getFastSelectFont();
mTheme->getDescriptionFont()->drawCenteredText("Sort order:", 0, (int)(sh * 0.6f - (mTheme->getDescriptionFont()->getHeight() * 0.5f)), mTextColor); std::shared_ptr<Font> subtextFont = mTheme->getDescriptionFont();
letterFont->drawCenteredText(LETTERS.substr(mLetterID, 1), 0, (int)(sh * 0.5f - (letterFont->getHeight() * 0.5f)), mTextColor);
subtextFont->drawCenteredText("Sort order:", 0, (int)(sh * 0.6f - (subtextFont->getHeight() * 0.5f)), mTextColor);
std::string sortString = "<- " + mParent->getSortState().description + " ->"; std::string sortString = "<- " + mParent->getSortState().description + " ->";
mTheme->getDescriptionFont()->drawCenteredText(sortString, 0, (int)(sh * 0.6f + (mTheme->getDescriptionFont()->getHeight() * 0.5f)), mTextColor); subtextFont->drawCenteredText(sortString, 0, (int)(sh * 0.6f + (subtextFont->getHeight() * 0.5f)), mTextColor);
} }
bool GuiFastSelect::input(InputConfig* config, Input input) bool GuiFastSelect::input(InputConfig* config, Input input)

2
src/components/ThemeComponent.cpp
View file

@ -53,7 +53,7 @@ std::shared_ptr<Font> ThemeComponent::getDescriptionFont()
std::shared_ptr<Font> ThemeComponent::getFastSelectFont() std::shared_ptr<Font> ThemeComponent::getFastSelectFont()
{ {
if(mFastSelectFont == NULL) if(mFastSelectFont)
return mFastSelectFont; return mFastSelectFont;
else else
return Font::get(*mWindow->getResourceManager(), Font::getDefaultPath(), FONT_SIZE_LARGE); return Font::get(*mWindow->getResourceManager(), Font::getDefaultPath(), FONT_SIZE_LARGE);