From b59db4b2fefbca4502e68af89c4b08aceee04432 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 8 Feb 2015 11:56:42 -0800 Subject: toolbar: focus view when popover is closed Fix a regression from 982469e3ae060885b271ef193ca60dfc28e66749 where view accelerators would stop working after using the popover. --- src/nautilus-toolbar.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index 93b1c1ba6..0c12f21be 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -404,6 +404,19 @@ zoom_level_changed (GtkRange *range, g_variant_new_int32 ((gint) zoom_level)); } +static void +view_menu_popover_closed (GtkPopover *popover, + NautilusToolbar *self) +{ + NautilusWindowSlot *slot; + NautilusView *view; + + slot = nautilus_window_get_active_slot (self->priv->window); + view = nautilus_window_slot_get_current_view (slot); + + nautilus_view_grab_focus (view); +} + static void nautilus_toolbar_init (NautilusToolbar *self) { @@ -432,6 +445,8 @@ nautilus_toolbar_init (NautilusToolbar *self) self->priv->reload = GTK_WIDGET (gtk_builder_get_object (builder, "reload")); self->priv->stop = GTK_WIDGET (gtk_builder_get_object (builder, "stop")); + g_signal_connect (self->priv->view_menu_widget, "closed", + G_CALLBACK (view_menu_popover_closed), self); gtk_menu_button_set_popover (GTK_MENU_BUTTON (self->priv->view_button), self->priv->view_menu_widget); g_object_unref (builder); -- cgit v1.2.1