aboutsummaryrefslogtreecommitdiff
path: root/backends/events
diff options
context:
space:
mode:
authorEugene Sandulenko2017-02-21 23:29:51 +0100
committerGitHub2017-02-21 23:29:51 +0100
commit8458e3deb7d76358b41f6e0b7f39cec9db358413 (patch)
treeba69d4b382270968305ffed8ff985d83d37fe2c5 /backends/events
parent98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8 (diff)
parentcdda943c8a3089551843be3dedaaddb6c5348555 (diff)
downloadscummvm-rg350-8458e3deb7d76358b41f6e0b7f39cec9db358413.tar.gz
scummvm-rg350-8458e3deb7d76358b41f6e0b7f39cec9db358413.tar.bz2
scummvm-rg350-8458e3deb7d76358b41f6e0b7f39cec9db358413.zip
Merge pull request #905 from lubomyr/master
ANDROIDSDL: added tab Control in main Options menu for switching some features
Diffstat (limited to 'backends/events')
-rw-r--r--backends/events/androidsdl/androidsdl-events.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/backends/events/androidsdl/androidsdl-events.cpp b/backends/events/androidsdl/androidsdl-events.cpp
index 0adcff817e..125f411289 100644
--- a/backends/events/androidsdl/androidsdl-events.cpp
+++ b/backends/events/androidsdl/androidsdl-events.cpp
@@ -26,7 +26,6 @@
#include "backends/events/androidsdl/androidsdl-events.h"
#include "backends/platform/androidsdl/androidsdl-sdl.h"
-#include <SDL_screenkeyboard.h>
bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) {
if (ev.button.button == SDL_BUTTON_LEFT)
@@ -43,16 +42,8 @@ bool AndroidSdlEventSource::handleMouseButtonDown(SDL_Event &ev, Common::Event &
else if (ev.button.button == SDL_BUTTON_MIDDLE) {
event.type = Common::EVENT_MBUTTONDOWN;
- static int show_onscreen = 0;
- if (show_onscreen == 0) {
- SDL_ANDROID_SetScreenKeyboardShown(0);
- show_onscreen++;
- } else if (show_onscreen==1) {
- SDL_ANDROID_SetScreenKeyboardShown(1);
- show_onscreen++;
- }
- if (show_onscreen == 2)
- show_onscreen = 0;
+ const bool show_onscreen = g_system->getFeatureState(OSystem::kFeatureOnScreenControl);
+ g_system->setFeatureState(OSystem::kFeatureOnScreenControl, !show_onscreen);
}
#endif
else