summaryrefslogtreecommitdiff
path: root/src/grail-gestures.c
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-08-07 17:05:06 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-08-07 17:05:06 +0200
commit5b1126b08faa91bbe26d89c63e5c514911088a0a (patch)
tree7610d624a511d427f3cde6b729cef25a6416e740 /src/grail-gestures.c
parent1681e90809ae248299bc5be5a9af12e871544a7d (diff)
move: accumulate delta while inactive
Diffstat (limited to 'src/grail-gestures.c')
-rw-r--r--src/grail-gestures.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/grail-gestures.c b/src/grail-gestures.c
index 0c0efdb..3c95d6f 100644
--- a/src/grail-gestures.c
+++ b/src/grail-gestures.c
@@ -109,11 +109,16 @@ static int move_reset(struct filter_model *m, float val)
109 109
110static int move_update(struct filter_model *m, float val) 110static int move_update(struct filter_model *m, float val)
111{ 111{
112 float dval = val - m->orig;
112 m->delta = val - m->val; 113 m->delta = val - m->val;
113 m->tickle = fabs(m->delta) > 0; 114 m->tickle = fabs(m->delta) > 0.5;
114 m->val = val; 115 m->val = val;
115 if (!m->active && fabs(val - m->orig) > m->bar) 116 if (!m->active) {
116 m->active = 1; 117 if (fabs(dval) > m->bar)
118 m->active = 1;
119 else
120 m->delta = dval;
121 }
117 return m->active; 122 return m->active;
118} 123}
119 124