Skip to content

Commit d94ece5

Browse files
committed
GestureController: Only accept signals from the recognizing backend
Backends should usually make sure that they consume events but just in case and while we're using touchegg and our own pan backend at the same time for touchscreens don't let events from other backends mess with the current gesture.
1 parent 8461381 commit d94ece5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

lib/Gestures/GestureController.vala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ public class Gala.GestureController : Object {
192192
return recognizing;
193193
}
194194

195-
private void gesture_begin (double percentage, uint64 elapsed_time) {
196-
if (!recognizing) {
195+
private void gesture_begin (GestureBackend backend, double percentage, uint64 elapsed_time) {
196+
if (!recognizing || backend != recognizing_backend) {
197197
return;
198198
}
199199

@@ -204,8 +204,8 @@ public class Gala.GestureController : Object {
204204
previous_time = elapsed_time;
205205
}
206206

207-
private void gesture_update (double percentage, uint64 elapsed_time) {
208-
if (!recognizing) {
207+
private void gesture_update (GestureBackend backend, double percentage, uint64 elapsed_time) {
208+
if (!recognizing || backend != recognizing_backend) {
209209
return;
210210
}
211211

@@ -229,8 +229,8 @@ public class Gala.GestureController : Object {
229229
previous_delta = updated_delta;
230230
}
231231

232-
private void gesture_end (double percentage, uint64 elapsed_time) {
233-
if (!recognizing) {
232+
private void gesture_end (GestureBackend backend, double percentage, uint64 elapsed_time) {
233+
if (!recognizing || backend != recognizing_backend) {
234234
return;
235235
}
236236

@@ -325,8 +325,8 @@ public class Gala.GestureController : Object {
325325

326326
public void cancel_gesture () {
327327
if (recognizing) {
328+
gesture_end (recognizing_backend, previous_percentage, previous_time);
328329
recognizing_backend.cancel_gesture ();
329-
gesture_end (previous_percentage, previous_time);
330330
}
331331
}
332332
}

0 commit comments

Comments
 (0)