Merge lp:~chasedouglas/oif-qml/no-touchscreen-conversion into lp:oif-qml

[Chase Douglas]

Don't convert touchscreen coordinates anymore. The coordinates are already in window space.

[lp:~chasedouglas/oif-qml/no-touchscreen-conversion]

113. By Chase Douglas on 2012-04-23

Continue processing events until all have been consumed

This fixes the "Failed to dispatch geis events" warning from being
emitted.

[Stephen M. Webb (bregma)]

OK.

review: Approve

=== modified file 'src/geissingleton.cpp'
--- src/geissingleton.cpp	2011-10-14 17:22:30 +0000
+++ src/geissingleton.cpp	2012-04-23 22:34:23 +0000
@@ -273,13 +273,12 @@
   foreach (const GestureArea* area, window_map_.values(window)) {
     QGraphicsScene* scene = area->scene();
     QGraphicsView* view = scene->views().first();
-    QRectF bounds(view->mapToGlobal(QPoint(0, 0)), view->size());
 
     /* touches may be null if it consists of only one point */
     if (touches.isValid()) {
-      if (bounds.contains(touches))
+      if (view->sceneRect().contains(touches))
         return scene;
-    } else if (bounds.contains(touches.topLeft())) {
+    } else if (view->sceneRect().contains(touches.topLeft())) {
       return scene;
     }
   }
@@ -349,9 +348,6 @@
     }
 
     if (scene) {
-      QPoint offset(scene->views().first()->mapFromGlobal(QPoint(0, 0)));
-      touches_rect.translate(offset);
-
       if (touches_rect.isValid())
         items.append(scene->items(touches_rect));
       else