callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkgesturezoom: Handle touchpad pinch events

Browse Source 
We let these through in GtkEventController::filter, and handle
these especially on GtkGesture::update.
This commit is contained in:
Carlos Garnacho
2015-07-09 19:31:27 +02:00
parent d756463d9b
commit 068a844930
1 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/gtkgesturezoom.c
View File

@ -75,6 +75,7 @@ static gboolean
_gtk_gesture_zoom_get_distance (GtkGestureZoom *zoom, _gtk_gesture_zoom_get_distance (GtkGestureZoom *zoom,
gdouble *distance) gdouble *distance)
{ {
const GdkEvent *last_event;
gdouble x1, y1, x2, y2; gdouble x1, y1, x2, y2;
GtkGesture *gesture; GtkGesture *gesture;
GList *sequences; GList *sequences;
@ -86,15 +87,32 @@ _gtk_gesture_zoom_get_distance (GtkGestureZoom *zoom,
return FALSE; return FALSE;
sequences = gtk_gesture_get_sequences (gesture); sequences = gtk_gesture_get_sequences (gesture);
g_assert (sequences && sequences->next); if (!sequences)
return FALSE;
gtk_gesture_get_point (gesture, sequences->data, &x1, &y1); last_event = gtk_gesture_get_last_event (gesture, sequences->data);
gtk_gesture_get_point (gesture, sequences->next->data, &x2, &y2);
g_list_free (sequences);
dx = x1 - x2; if (last_event->type == GDK_TOUCHPAD_PINCH &&
dy = y1 - y2;; (last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
*distance = sqrt ((dx * dx) + (dy * dy)); last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_END))
{
/* Touchpad pinch */
*distance = last_event->touchpad_pinch.scale;
}
else
{
if (!sequences->next)
return FALSE;
gtk_gesture_get_point (gesture, sequences->data, &x1, &y1);
gtk_gesture_get_point (gesture, sequences->next->data, &x2, &y2);
g_list_free (sequences);
dx = x1 - x2;
dy = y1 - y2;;
*distance = sqrt ((dx * dx) + (dy * dy));
}
return TRUE; return TRUE;
} }
@ -119,6 +137,22 @@ _gtk_gesture_zoom_check_emit (GtkGestureZoom *gesture)
return TRUE; return TRUE;
} }
static gboolean
gtk_gesture_zoom_filter_event (GtkEventController *controller,
const GdkEvent *event)
{
/* Let 2-finger touchpad pinch events go through */
if (event->type == GDK_TOUCHPAD_PINCH)
{
if (event->touchpad_pinch.n_fingers == 2)
return FALSE;
else
return TRUE;
}
return GTK_EVENT_CONTROLLER_CLASS (gtk_gesture_zoom_parent_class)->filter_event (controller, event);
}
static void static void
gtk_gesture_zoom_begin (GtkGesture *gesture, gtk_gesture_zoom_begin (GtkGesture *gesture,
GdkEventSequence *sequence) GdkEventSequence *sequence)
@ -141,10 +175,13 @@ static void
gtk_gesture_zoom_class_init (GtkGestureZoomClass *klass) gtk_gesture_zoom_class_init (GtkGestureZoomClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkEventControllerClass *event_controller_class = GTK_EVENT_CONTROLLER_CLASS (klass);
GtkGestureClass *gesture_class = GTK_GESTURE_CLASS (klass); GtkGestureClass *gesture_class = GTK_GESTURE_CLASS (klass);
object_class->constructor = gtk_gesture_zoom_constructor; object_class->constructor = gtk_gesture_zoom_constructor;
event_controller_class->filter_event = gtk_gesture_zoom_filter_event;
gesture_class->begin = gtk_gesture_zoom_begin; gesture_class->begin = gtk_gesture_zoom_begin;
gesture_class->update = gtk_gesture_zoom_update; gesture_class->update = gtk_gesture_zoom_update;