summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@alnilam.(none)>2010-02-01 14:44:57 +0100
committerHenrik Rydberg <rydberg@alnilam.(none)>2010-02-01 14:44:57 +0100
commit8dcaab4219c3827c0661917542a28b1276703d8b (patch)
treeb4e4c8bf9fe3bd86f4e668a21ae3ea4e7c6ece92 /src
parent2d291a123fe6a83f50cf7b93bceea872ab342d18 (diff)
Revert "sweep feels better without memory"
Really too specialized behavior, so better off without it. This reverts commit e880479ff29e57d8b47f08f620b4bccdd2683aa5.
Diffstat (limited to 'src')
-rw-r--r--src/multitouch.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/multitouch.c b/src/multitouch.c
index 6a54c45..f6e5305 100644
--- a/src/multitouch.c
+++ b/src/multitouch.c
@@ -257,14 +257,13 @@ static void handle_gestures(LocalDevicePtr local,
257 } 257 }
258 if (GETBIT(gs->type, GS_HSCROLL)) { 258 if (GETBIT(gs->type, GS_HSCROLL)) {
259 hscroll += gs->dx; 259 hscroll += gs->dx;
260 // sweep is more natural as a one-time thing 260 while (hscroll > hstep) {
261 if (hscroll > hstep) {
262 tickle_button(local, 6); 261 tickle_button(local, 6);
263 hscroll = 0; 262 hscroll -= hstep;
264 } 263 }
265 if (hscroll < -hstep) { 264 while (hscroll < -hstep) {
266 tickle_button(local, 7); 265 tickle_button(local, 7);
267 hscroll = 0; 266 hscroll += hstep;
268 } 267 }
269 TRACE1("hscroll: %d\n", gs->dx); 268 TRACE1("hscroll: %d\n", gs->dx);
270 } 269 }