diff options
author | Ernestas Kulik <ernestask@gnome.org> | 2017-05-13 20:29:15 +0300 |
---|---|---|
committer | Ernestas Kulik <ernestask@gnome.org> | 2017-05-14 12:21:12 +0300 |
commit | fb8b8ca54e29de2a9208793927e96cf324ae0418 (patch) | |
tree | 7eafce7ee5b526565f36d97802c199055c02a012 /src/nautilus-canvas-view.c | |
parent | 1e898de96648fa9cb12653ed129c7ed2b0c26c72 (diff) | |
download | nautilus-fb8b8ca54e29de2a9208793927e96cf324ae0418.tar.gz |
views: handle keyboard activation in files-view
Each view handles keyboard activation on its own by listening to
key-press-event, yet there are actions in files-view that could handle
it. This commit makes it so, additionally swapping the accelerators for
opening in new tab and window to make things more consistent throughout
the application (and others, too, e.g. Firefox).
https://bugzilla.gnome.org/show_bug.cgi?id=782600
Diffstat (limited to 'src/nautilus-canvas-view.c')
-rw-r--r-- | src/nautilus-canvas-view.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c index b3a062f85..6bc726a75 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -1361,7 +1361,7 @@ canvas_container_activate_alternate_callback (NautilusCanvasContainer *container GdkEvent *event; GdkEventButton *button_event; GdkEventKey *key_event; - gboolean open_in_tab, open_in_window, close_behind; + gboolean open_in_tab, open_in_window; NautilusWindowOpenFlags flags; g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view)); @@ -1371,7 +1371,6 @@ canvas_container_activate_alternate_callback (NautilusCanvasContainer *container event = gtk_get_current_event (); open_in_tab = FALSE; open_in_window = FALSE; - close_behind = FALSE; if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE || @@ -1400,13 +1399,8 @@ canvas_container_activate_alternate_callback (NautilusCanvasContainer *container flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW; } - if (close_behind) - { - flags |= NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND; - } - - DEBUG ("Activate alternate, open in tab %d, close behind %d, new window %d\n", - open_in_tab, close_behind, open_in_window); + DEBUG ("Activate alternate, open in tab %d, new window %d\n", + open_in_tab, open_in_window); nautilus_files_view_activate_files (NAUTILUS_FILES_VIEW (canvas_view), file_list, |