1
=== modified file 'src/geissingleton.cpp'
2
--- src/geissingleton.cpp	2011-08-01 22:37:58 +0000
3
+++ src/geissingleton.cpp	2011-08-08 18:25:37 +0000
4
@@ -364,6 +364,9 @@
5
364
      if (!area)
364
      if (!area)
6
365
        continue;
365
        continue;
7
366
366
8
367
      if (touches.count() != area->subscription()->touches()->start())
9
368
          continue;
10
369
11
367
      if (!area->subscription()->_UNITY_globalGesture()) {
370
      if (!area->subscription()->_UNITY_globalGesture()) {
12
368
        /* We have an area that intersects with the box, now check if the
371
        /* We have an area that intersects with the box, now check if the
13
369
         * area contains the box.
372
         * area contains the box.
Status:	Merged
Merged at revision:	106
Proposed branch:	lp:~chasedouglas/oif-qml/check-touch-count
Merge into:	lp:oif-qml
Diff against target:	13 lines (+3/-0) 1 file modified src/geissingleton.cpp (+3/-0)
To merge this branch:	bzr merge lp:~chasedouglas/oif-qml/check-touch-count
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Stephen M. Webb (community)		2011-08-08	Approve on 2011-08-08
Review via email: mp+70771@code.launchpad.net
1	=== modified file 'src/geissingleton.cpp'
2	--- src/geissingleton.cpp 2011-08-01 22:37:58 +0000
3	+++ src/geissingleton.cpp 2011-08-08 18:25:37 +0000
4	@@ -364,6 +364,9 @@
5	364	if (!area)	364	if (!area)
6	365	continue;	365	continue;
7	366		366
8			367	if (touches.count() != area->subscription()->touches()->start())
9			368	continue;
10			369
11	367	if (!area->subscription()->_UNITY_globalGesture()) {	370	if (!area->subscription()->_UNITY_globalGesture()) {
12	368	/* We have an area that intersects with the box, now check if the	371	/* We have an area that intersects with the box, now check if the
13	369	* area contains the box.	372	* area contains the box.