summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2014-04-29 14:30:44 -0700
committerKristian Høgsberg <krh@bitplanet.net>2014-04-29 14:30:44 -0700
commit1f67117f6fb171375505853f528a758891d5f475 (patch)
tree447bcf75534f794e3e8bfcd64b0a1b17c094df26
parentc31f624141ab03baf243441467806753b9c2bb74 (diff)
downloadweston-1f67117f6fb171375505853f528a758891d5f475.tar.gz
window.c: Also grab touch events when grabbing input
-rw-r--r--clients/window.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/clients/window.c b/clients/window.c
index adcec0dc..466ce863 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2979,9 +2979,12 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
return;
}
- widget = window_find_widget(input->touch_focus,
- wl_fixed_to_double(x_w),
- wl_fixed_to_double(y_w));
+ if (input->grab)
+ widget = input->grab;
+ else
+ widget = window_find_widget(input->touch_focus,
+ wl_fixed_to_double(x_w),
+ wl_fixed_to_double(y_w));
if (widget) {
struct touch_point *tp = xmalloc(sizeof *tp);
if (tp) {