summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntónio Fernandes <antoniof@gnome.org>2018-10-11 11:50:20 +0100
committerCarlos Soriano <csoriano@redhat.com>2018-10-12 12:31:41 +0200
commit3a88af0bc129806010ce2655f65106b28651ffa2 (patch)
tree325ce7aafb9f51f95c1ad141307a08001586bd12
parent44147d35ba0c303ce964a69ee36ce3bcf1d4a80e (diff)
downloadnautilus-3a88af0bc129806010ce2655f65106b28651ffa2.tar.gz
window: Revert to chaining up first
Commit dae54e0c72e92a3129c4e8754bd9f3025e487c72 made the slot handle the key press event before chaining up. But this breaks the [~] and [/] accelerators, possibly because the slot handles them as type-to-search, stopping the event without chaining up. To fix this regression, revert to chaining up first. Pressing [Down] on search entry to focus the view won't work like this, but we are fixing that in the next commit. Fixes: https://gitlab.gnome.org/GNOME/nautilus/issues/684
-rw-r--r--src/nautilus-window.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 4f7407774..7fe090987 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2493,13 +2493,12 @@ nautilus_window_key_press_event (GtkWidget *widget,
}
}
- if (nautilus_window_slot_handle_event (window->active_slot, (GdkEvent *) event))
+ if (GTK_WIDGET_CLASS (nautilus_window_parent_class)->key_press_event (widget, event))
{
return GDK_EVENT_STOP;
}
-
- if (GTK_WIDGET_CLASS (nautilus_window_parent_class)->key_press_event (widget, event))
+ if (nautilus_window_slot_handle_event (window->active_slot, (GdkEvent *) event))
{
return GDK_EVENT_STOP;
}