From f82121d2a279693f47a25e30e36c34e1e0ff21bd Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sun, 13 Mar 2011 23:27:36 +0100
Subject: ANDROID: Don't merge mouse move events

Breaks more than it solves
---
 backends/platform/android/android.cpp | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'backends')

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);
 }
-- 
cgit v1.2.3