Grail

Merge lp:~oif-team/grail/trunk.v1.0.15+r99 into lp:grail

  1. trunk.v1.0.15+r99
  2. Merge into trunk
Proposed by Henrik Rydberg
Status: Merged
Merged at revision: 99
Proposed branch: lp:~oif-team/grail/trunk.v1.0.15+r99
Merge into: lp:grail
Diff against target: 17 lines (+3/-3)
1 file modified
src/grail-api.c (+3/-3)
To merge this branch: bzr merge lp:~oif-team/grail/trunk.v1.0.15+r99
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+39534@code.launchpad.net

Description of the change

Report touch down on one-finger entry (LP: #667802)

The single patch, for both natty and maverick SRU.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Henrik knows what he's doing, the patch seems reasonable, and we can test it out before we decide to make any new releases of utouch-grail.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/grail-api.c'
2--- src/grail-api.c 2010-09-21 11:26:10 +0000
3+++ src/grail-api.c 2010-10-28 14:29:44 +0000
4@@ -90,10 +90,10 @@
5 struct tapping_model *tap = &gru->tapping;
6 int used_move = grail_mask_count(gin->types, sizeof(gin->types));
7 int used_tap = grail_mask_get(gin->types, GRAIL_TYPE_TAP1);
8- int ismove = move->single && (move->active & fm_mask) && !used_move;
9- int ishold = move->single && tap->active && !used_move;
10+ int pointer = move->ntouch == 1;
11+ int ismove = pointer && (move->active & fm_mask) && !used_move;
12+ int ishold = pointer && tap->active && !used_move;
13 int istap = gru->tapping.tap == 1 && !used_tap;
14- int pointer = move->single;
15
16 if (!impl->pointer_status && pointer) {
17 impl->report_x = impl->pointer_x;

Subscribers

People subscribed via source and target branches

to all changes: