ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add outline on font for instructions in the overworld, fixing cases where the text is hard to read

Browse Source
This commit is contained in:
Marianne Gagnon 2015-02-28 20:41:12 -05:00
parent cb5670c843
commit c205aa533b
3 changed files with 11 additions and 2 deletions

6
src/guiengine/engine.cpp

@ -689,6 +689,7 @@ namespace GUIEngine
IGUIEnvironment* g_env;
Skin* g_skin = NULL;
ScalableFont *g_font;
ScalableFont *g_outline_font;
ScalableFont *g_large_font;
ScalableFont *g_title_font;
ScalableFont *g_small_font;
@ -974,6 +975,8 @@ namespace GUIEngine
g_large_font = NULL;
g_digit_font->drop();
g_digit_font = NULL;
g_outline_font->drop();
g_outline_font = NULL;
// nothing else to delete for now AFAIK, irrlicht will automatically
// kill everything along the device
@ -1080,6 +1083,9 @@ namespace GUIEngine
sfont_larger->setKerningHeight(-5);
g_large_font = sfont_larger;
g_outline_font = sfont->getHollowCopy();
g_outline_font->m_black_border = true;
Private::large_font_height = g_large_font->getDimension( L"X" ).Height;
ScalableFont* sfont_smaller = sfont->getHollowCopy();

3
src/guiengine/engine.hpp

@ -83,6 +83,7 @@ namespace GUIEngine
extern Skin* g_skin;
extern irr::gui::ScalableFont* g_small_font;
extern irr::gui::ScalableFont* g_font;
extern irr::gui::ScalableFont* g_outline_font;
extern irr::gui::ScalableFont* g_large_font;
extern irr::gui::ScalableFont* g_title_font;
extern irr::gui::ScalableFont* g_digit_font;
@ -136,6 +137,8 @@ namespace GUIEngine
*/
inline irr::gui::ScalableFont* getFont() { return Private::g_font; }
inline irr::gui::ScalableFont* getOutlineFont() { return Private::g_outline_font; }
/**
* \return the "large" font (useful for text)
*/

4
src/states_screens/race_gui_overworld.cpp

@ -459,7 +459,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
UserConfigParams::m_height - GUIEngine::getFontHeight()*2,
UserConfigParams::m_width,
UserConfigParams::m_height);
GUIEngine::getFont()->draw(_("Press fire to play the tutorial"), pos2,
GUIEngine::getOutlineFont()->draw(_("Press fire to play the tutorial"), pos2,
video::SColor(255,255,150,60),
true, true /* vcenter */, NULL);
continue;
@ -529,7 +529,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
UserConfigParams::m_height - GUIEngine::getFontHeight()*2,
UserConfigParams::m_width,
UserConfigParams::m_height);
GUIEngine::getFont()->draw(_("Press fire to start the challenge"), pos2,
GUIEngine::getOutlineFont()->draw(_("Press fire to start the challenge"), pos2,
video::SColor(255,255,150,60),
true, true /* vcenter */, NULL);
}