Skip to content

Commit 4adf25f

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 91e65ff commit 4adf25f

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
@@ -178,8 +178,8 @@ public class Gala.GestureController : Object {
178178
return recognizing;
179179
}
180180

181-
private void gesture_begin (double percentage, uint64 elapsed_time) {
182-
if (!recognizing) {
181+
private void gesture_begin (GestureBackend backend, double percentage, uint64 elapsed_time) {
182+
if (!recognizing || backend != recognizing_backend) {
183183
return;
184184
}
185185

@@ -190,8 +190,8 @@ public class Gala.GestureController : Object {
190190
previous_time = elapsed_time;
191191
}
192192

193-
private void gesture_update (double percentage, uint64 elapsed_time) {
194-
if (!recognizing) {
193+
private void gesture_update (GestureBackend backend, double percentage, uint64 elapsed_time) {
194+
if (!recognizing || backend != recognizing_backend) {
195195
return;
196196
}
197197

@@ -215,8 +215,8 @@ public class Gala.GestureController : Object {
215215
previous_delta = updated_delta;
216216
}
217217

218-
private void gesture_end (double percentage, uint64 elapsed_time) {
219-
if (!recognizing) {
218+
private void gesture_end (GestureBackend backend, double percentage, uint64 elapsed_time) {
219+
if (!recognizing || backend != recognizing_backend) {
220220
return;
221221
}
222222

@@ -311,8 +311,8 @@ public class Gala.GestureController : Object {
311311

312312
public void cancel_gesture () {
313313
if (recognizing) {
314+
gesture_end (recognizing_backend, previous_percentage, previous_time);
314315
recognizing_backend.cancel_gesture ();
315-
gesture_end (previous_percentage, previous_time);
316316
}
317317
}
318318
}

0 commit comments

Comments
 (0)