AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

pad controller: Use GdkEvent API

Browse Source
This commit is contained in:
Matthias Clasen 2017-08-26 10:56:25 -04:00 committed by Carlos Garnacho
parent ebc66eefa8
commit 75b16ac855
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkpadcontroller.c
View File

@ -235,14 +235,16 @@ gtk_pad_controller_handle_event (GtkEventController *controller,
GdkEventType event_type = gdk_event_get_event_type (event);
const GtkPadActionEntry *entry;
GtkPadActionType type;
gint index, mode;
guint index, mode, group;
gdouble value = 0;
gdk_event_get_pad_group_mode (event, &group, &mode);
if (event_type == GDK_PAD_GROUP_MODE)
{
gtk_pad_controller_handle_mode_switch (pad_controller,
gdk_event_get_source_device (event),
event->pad_group_mode.group,
event->pad_group_mode.mode);
group,
mode);
return GDK_EVENT_PROPAGATE;
}
@ -250,15 +252,13 @@ gtk_pad_controller_handle_event (GtkEventController *controller,
{
case GDK_PAD_BUTTON_PRESS:
type = GTK_PAD_ACTION_BUTTON;
index = event->pad_button.button;
mode = event->pad_button.mode;
gdk_event_get_pad_button (event, &index);
break;
case GDK_PAD_RING:
case GDK_PAD_STRIP:
type = event_type == GDK_PAD_RING ?
GTK_PAD_ACTION_RING : GTK_PAD_ACTION_STRIP;
index = event->pad_axis.index;
mode = event->pad_axis.mode;
gdk_event_get_pad_axis_value (event, &index, &value);
break;
default:
return GDK_EVENT_PROPAGATE;
@ -269,16 +269,10 @@ gtk_pad_controller_handle_event (GtkEventController *controller,
if (!entry)
return GDK_EVENT_PROPAGATE;
if (event_type == GDK_PAD_RING ||
event_type == GDK_PAD_STRIP)
{
gtk_pad_controller_activate_action_with_axis (pad_controller, entry,
event->pad_axis.value);
}
if (event_type == GDK_PAD_RING || event_type == GDK_PAD_STRIP)
gtk_pad_controller_activate_action_with_axis (pad_controller, entry, value);
else
{
gtk_pad_controller_activate_action (pad_controller, entry);
}
gtk_pad_controller_activate_action (pad_controller, entry);
return GDK_EVENT_STOP;
}