Commit d829af786ee7c76989a1105919b788fb7d07817f

Brandon Schaefer 2014-06-04T12:55:18

Assume all motion events are mouse events unless tool_type states otherwise.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/video/mir/SDL_mirevents.c b/src/video/mir/SDL_mirevents.c
index 208431d..b5829c7 100644
--- a/src/video/mir/SDL_mirevents.c
+++ b/src/video/mir/SDL_mirevents.c
@@ -224,12 +224,12 @@ HandleMotionEvent(MirMotionEvent const motion, SDL_Window* sdl_window)
 {
     int cord_index;
     for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) {
-        if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
-            HandleMouseEvent(motion, cord_index, sdl_window);
-        }
-        else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
+        if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
             HandleTouchEvent(motion, cord_index, sdl_window);
         }
+        else {
+            HandleMouseEvent(motion, cord_index, sdl_window);
+        }
     }
 }