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

Tweak range of touch device gui scale

Browse Source
This commit is contained in:
Deve
2018-10-03 21:11:56 +02:00
parent 693a3bc954
commit fedf93c928
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/dialogs/android/multitouch_settings.stkgui
View File

@@ -27,7 +27,7 @@
<label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Buttons scale"/>
<div proportion="1" align="center" height="fit" layout="horizontal-row" >
<spacer width="40" height="10" />
<gauge id="scale" proportion="1" min_value="50" max_value="150"/>
<gauge id="scale" proportion="1" min_value="80" max_value="160"/>
</div>
</div>

4
src/main_android.cpp
View File

@@ -55,10 +55,10 @@ void override_default_params()
{
case ACONFIGURATION_SCREENSIZE_SMALL:
case ACONFIGURATION_SCREENSIZE_NORMAL:
UserConfigParams::m_multitouch_scale = 1.3f;
UserConfigParams::m_multitouch_scale = 1.4f;
break;
case ACONFIGURATION_SCREENSIZE_LARGE:
UserConfigParams::m_multitouch_scale = 1.2f;
UserConfigParams::m_multitouch_scale = 1.3f;
break;
case ACONFIGURATION_SCREENSIZE_XLARGE:
UserConfigParams::m_multitouch_scale = 1.1f;

4
src/states_screens/dialogs/multitouch_settings_dialog.cpp
View File

@@ -139,10 +139,10 @@ GUIEngine::EventPropagation MultitouchSettingsDialog::processEvent(
{
case ACONFIGURATION_SCREENSIZE_SMALL:
case ACONFIGURATION_SCREENSIZE_NORMAL:
UserConfigParams::m_multitouch_scale = 1.3f;
UserConfigParams::m_multitouch_scale = 1.4f;
break;
case ACONFIGURATION_SCREENSIZE_LARGE:
UserConfigParams::m_multitouch_scale = 1.2f;
UserConfigParams::m_multitouch_scale = 1.3f;
break;
case ACONFIGURATION_SCREENSIZE_XLARGE:
UserConfigParams::m_multitouch_scale = 1.1f;

3
src/states_screens/race_gui.cpp
View File

@@ -527,7 +527,8 @@ void RaceGUI::drawGlobalMiniMap()
{
#ifndef SERVER_ONLY
//TODO : exception for some game modes ? Another option "Hidden in race, shown in battle ?"
if(UserConfigParams::m_minimap_display == 2 /*map hidden*/)
if (UserConfigParams::m_minimap_display == 2 /*map hidden*/ ||
UserConfigParams::m_multitouch_scale > 1.3f)
return;
// draw a map when arena has a navigation mesh.

8
src/states_screens/race_gui_multitouch.cpp
View File

@@ -56,13 +56,13 @@ RaceGUIMultitouch::RaceGUIMultitouch(RaceGUIBase* race_gui)
m_device = input_manager->getDeviceManager()->getMultitouchDevice();
if (UserConfigParams::m_multitouch_scale > 1.5f)
if (UserConfigParams::m_multitouch_scale > 1.6f)
{
UserConfigParams::m_multitouch_scale = 1.5f;
UserConfigParams::m_multitouch_scale = 1.6f;
}
else if (UserConfigParams::m_multitouch_scale < 0.5f)
else if (UserConfigParams::m_multitouch_scale < 0.8f)
{
UserConfigParams::m_multitouch_scale = 0.5f;
UserConfigParams::m_multitouch_scale = 0.8f;
}
init();