aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhewg2011-03-13 23:27:36 +0100
committerdhewg2011-03-13 23:31:07 +0100
commitf82121d2a279693f47a25e30e36c34e1e0ff21bd (patch)
tree2c71817262083f4d410c0236a47f5301a77d2a7d
parentecd265b539452cfbd5eee96b5e4817dbed397d72 (diff)
downloadscummvm-rg350-f82121d2a279693f47a25e30e36c34e1e0ff21bd.tar.gz
scummvm-rg350-f82121d2a279693f47a25e30e36c34e1e0ff21bd.tar.bz2
scummvm-rg350-f82121d2a279693f47a25e30e36c34e1e0ff21bd.zip
ANDROID: Don't merge mouse move events
Breaks more than it solves
-rw-r--r--backends/platform/android/android.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 606b825a51..9374a876d9 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -540,24 +540,7 @@ bool OSystem_Android::pollEvent(Common::Event &event) {
void OSystem_Android::pushEvent(const Common::Event& event) {
lockMutex(_event_queue_lock);
- // Try to combine multiple queued mouse move events
- if (event.type == Common::EVENT_MOUSEMOVE &&
- !_event_queue.empty() &&
- _event_queue.back().type == Common::EVENT_MOUSEMOVE) {
- Common::Event tail = _event_queue.back();
- if (event.kbd.flags) {
- // relative movement hack
- tail.mouse.x += event.mouse.x;
- tail.mouse.y += event.mouse.y;
- } else {
- // absolute position, clear relative flag
- tail.kbd.flags = 0;
- tail.mouse.x = event.mouse.x;
- tail.mouse.y = event.mouse.y;
- }
- } else {
- _event_queue.push(event);
- }
+ _event_queue.push(event);
unlockMutex(_event_queue_lock);
}