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

Assume that there are always 2 text lines in touch gui.

Browse Source 
It fixes overlapping text in CTF/Soccer.
This commit is contained in:
Deve 2018-11-18 21:42:42 +01:00
parent 45a1190374
commit 337e577d6f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/states_screens/race_gui.cpp
View File

@ -117,8 +117,7 @@ RaceGUI::RaceGUI()
// Originally m_map_height was 100, and we take 480 as minimum res
float scaling = irr_driver->getFrameSize().Height / 480.0f;
const float map_size = stk_config->m_minimap_size * map_size_splitscreen;
const float top_margin = world->raceHasLaps() ? 3.5f * m_font_height
: 1.8f * m_font_height;
const float top_margin = 3.5f * m_font_height;
if (UserConfigParams::m_multitouch_enabled &&
UserConfigParams::m_multitouch_mode != 0 &&
@ -499,7 +498,7 @@ void RaceGUI::drawGlobalMiniMap()
if (m_multitouch_gui != NULL)
{
float max_scale = World::getWorld()->raceHasLaps() ? 1.3f : 1.5f;
float max_scale = 1.3f;
if (UserConfigParams::m_multitouch_scale > max_scale)
return;