diff options
author | Matthias Clasen <mclasen@redhat.com> | 2018-02-07 19:47:56 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2018-02-07 19:47:56 -0500 |
commit | 4c2db9b5f0fd3fff5e13d5e8569615e887c7e149 (patch) | |
tree | 18839cde8fdf5bbbb3c9479db3ac7dc535fa905d | |
parent | 932a5126ad3ac2c768b8122a755e85766c6cd237 (diff) | |
download | gtk+-4c2db9b5f0fd3fff5e13d5e8569615e887c7e149.tar.gz |
places sidebar: Stop using ::key-press-event
Just switch to ::event for now.
-rw-r--r-- | gtk/gtkplacessidebar.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 266ca450b9..bf695fbc00 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -3386,17 +3386,19 @@ stop_shortcut_cb (GSimpleAction *action, } static gboolean -on_key_press_event (GtkWidget *widget, - GdkEventKey *event, - GtkPlacesSidebar *sidebar) +on_event (GtkWidget *widget, + GdkEvent *event, + GtkPlacesSidebar *sidebar) { guint modifiers; GtkListBoxRow *row; guint keyval, state; - if (event && - gdk_event_get_keyval ((GdkEvent *) event, &keyval) && - gdk_event_get_state ((GdkEvent *) event, &state)) + if (gdk_event_get_event_type (event) != GDK_KEY_PRESS) + return GDK_EVENT_PROPAGATE; + + if (gdk_event_get_keyval (event, &keyval) && + gdk_event_get_state (event, &state)) { row = gtk_list_box_get_selected_row (GTK_LIST_BOX (sidebar->list_box)); if (row) @@ -4051,8 +4053,8 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar) g_signal_connect (sidebar->list_box, "row-activated", G_CALLBACK (on_row_activated), sidebar); - g_signal_connect (sidebar->list_box, "key-press-event", - G_CALLBACK (on_key_press_event), sidebar); + g_signal_connect (sidebar->list_box, "event", + G_CALLBACK (on_event), sidebar); sidebar->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (sidebar)); gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (sidebar->long_press_gesture), TRUE); |