thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Use the dedicated GUI option for enabling the touchpad mode

Browse source
This commit is contained in:
Cameron Cawley 2019-04-12 21:00:08 +01:00
parent 4c38b454fe
commit 0361373700
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backends/platform/android/android.cpp
View file

@ -343,14 +343,16 @@ void OSystem_Android::initBackend() {
ConfMan.set("fullscreen", "true");
ConfMan.registerDefault("aspect_ratio", true);
ConfMan.registerDefault("touchpad_mouse_mode", true);
ConfMan.setInt("autosave_period", 0);
ConfMan.setBool("FM_high_quality", false);
ConfMan.setBool("FM_medium_quality", true);
// TODO hackity hack
if (ConfMan.hasKey("multi_midi"))
_touchpad_mode = !ConfMan.getBool("multi_midi");
if (ConfMan.hasKey("touchpad_mouse_mode"))
_touchpad_mode = ConfMan.getBool("touchpad_mouse_mode");
else
ConfMan.setBool("touchpad_mouse_mode", true);
// must happen before creating TimerManager to avoid race in
// creating EventManager
@ -402,7 +404,8 @@ bool OSystem_Android::hasFeature(Feature f) {
f == kFeatureOpenGL ||
#endif
f == kFeatureOverlaySupportsAlpha ||
f == kFeatureOpenUrl);
f == kFeatureOpenUrl ||
f == kFeatureTouchpadMode);
}
void OSystem_Android::setFeatureState(Feature f, bool enable) {
@ -429,6 +432,10 @@ void OSystem_Android::setFeatureState(Feature f, bool enable) {
if (!enable)
disableCursorPalette();
break;
case kFeatureTouchpadMode:
ConfMan.setBool("touchpad_mouse_mode", enable);
_touchpad_mode = enable;
break;
default:
break;
}
@ -446,6 +453,8 @@ bool OSystem_Android::getFeatureState(Feature f) {
return _virtcontrols_on;
case kFeatureCursorPalette:
return _use_mouse_palette;
case kFeatureTouchpadMode:
return ConfMan.getBool("touchpad_mouse_mode");
default:
return false;
}