summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@gnome.org>2018-08-15 14:48:37 +0300
committerErnestas Kulik <ekulik@redhat.com>2019-06-29 14:33:41 +0200
commitbad2a16a3786c166aa066bd213d695a3b53e0705 (patch)
treeb5dff86c7d07cccaa76d6f0d965a2d94f01396ab
parent3df7b8e39328a5056b2b73ab771ad9c713a7d215 (diff)
downloadnautilus-bad2a16a3786c166aa066bd213d695a3b53e0705.tar.gz
eel: canvas: Handle touch events alongside button presses
Since the GtkGestureMultiPress also supports touch events, the code should treat them as button events, otherwise an assertion may be reached in a bad spot. In particular, eel_canvas_handle_event() does that in the default case. Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/582
-rw-r--r--eel/eel-canvas.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 8a5c1fa96..e2d172915 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -2893,6 +2893,7 @@ eel_canvas_handle_event (EelCanvas *canvas,
switch (event_type)
{
case GDK_BUTTON_PRESS:
+ case GDK_TOUCH_BEGIN:
{
/* Pick the current item as if the button were not pressed, and
* then process the event.
@@ -2912,6 +2913,7 @@ eel_canvas_handle_event (EelCanvas *canvas,
break;
case GDK_BUTTON_RELEASE:
+ case GDK_TOUCH_END:
{
/* Process the event as if the button were pressed, then repick
* after the button has been released