filter-view: Explicitly select the first item when filtering is

applied.

Focus order out of the filter box is not reliable, and this matches
the old behavior where the first item was automatically selected.

Fixes #3780

Author: mtwebster

libnemo-private/nemo-icon-container.c

@@ -6199,6 +6199,43 @@ nemo_icon_container_select_all (NemoIconContainer *container)
 	}
 }
 
+/**
+ * nemo_icon_container_select_first:
+ * @container: An icon container widget.
+ *
+ * Selects the first icon in display order, unselecting any others.
+ * The icon list is resorted first if pending changes (such as
+ * a filtered add) left it out of order.
+ **/
+void
+nemo_icon_container_select_first (NemoIconContainer *container)
+{
+    NemoIcon *icon;
+
+    g_return_if_fail (NEMO_IS_ICON_CONTAINER (container));
+
+    if (container->details->needs_resort) {
+        nemo_icon_container_resort (container);
+        container->details->needs_resort = FALSE;
+    }
+
+    if (container->details->icons == NULL) {
+        return;
+    }
+
+    icon = container->details->icons->data;
+
+    /* Drop any stale keyboard focus from the previous selection so arrow-key
+     * navigation starts from this new selection. */
+    clear_keyboard_focus (container);
+    clear_keyboard_rubberband_start (container);
+    container->details->range_selection_base_icon = icon;
+
+    if (select_one_unselect_others (container, icon)) {
+        g_signal_emit (container, signals[SELECTION_CHANGED], 0);
+    }
+}
+
 /**
  * nemo_icon_container_set_selection:
  * @container: An icon container widget.

libnemo-private/nemo-icon-container.h

@@ -302,6 +302,7 @@ void              nemo_icon_container_set_highlighted_for_clipboard (NemoIconCon
 /* operations on all icons */
 void              nemo_icon_container_unselect_all                  (NemoIconContainer  *view);
 void              nemo_icon_container_select_all                    (NemoIconContainer  *view);
+void              nemo_icon_container_select_first                  (NemoIconContainer  *container);
 
 
 /* operations on the selection */

src/nemo-icon-view.c

@@ -2380,6 +2380,17 @@ nemo_icon_view_update_filter_text (NemoView   *view,
     }
 }
 
+static void
+nemo_icon_view_select_first (NemoView *view)
+{
+    NemoIconContainer *container;
+
+    container = nemo_icon_view_get_icon_container (NEMO_ICON_VIEW (view));
+    if (container != NULL) {
+        nemo_icon_container_select_first (container);
+    }
+}
+
 static gboolean
 icon_container_activate_filter_cb (NemoIconContainer *container,
                                    GdkEvent *event,
@@ -2775,6 +2786,7 @@ nemo_icon_view_class_init (NemoIconViewClass *klass)
 	nemo_view_class->invert_selection = nemo_icon_view_invert_selection;
 	nemo_view_class->compare_files = compare_files;
 	nemo_view_class->update_filter_text = nemo_icon_view_update_filter_text;
+	nemo_view_class->select_first = nemo_icon_view_select_first;
 	nemo_view_class->zoom_to_level = nemo_icon_view_zoom_to_level;
 	nemo_view_class->get_zoom_level = nemo_icon_view_get_zoom_level;
         nemo_view_class->click_policy_changed = nemo_icon_view_click_policy_changed;

src/nemo-list-view.c

@@ -274,6 +274,7 @@ get_default_sort_order (NemoFile *file, gboolean *reversed)
 }
 
 static void nemo_list_view_update_filter_text (NemoView *view, const char *filter_text);
+static void nemo_list_view_select_first        (NemoView *view);
 
 static void
 tooltip_prefs_changed_callback (NemoListView *view)
@@ -4427,6 +4428,7 @@ nemo_list_view_class_init (NemoListViewClass *class)
 	nemo_view_class->invert_selection = nemo_list_view_invert_selection;
 	nemo_view_class->compare_files = nemo_list_view_compare_files;
 	nemo_view_class->update_filter_text = nemo_list_view_update_filter_text;
+	nemo_view_class->select_first = nemo_list_view_select_first;
 	nemo_view_class->sort_directories_first_changed = nemo_list_view_sort_directories_first_changed;
 	nemo_view_class->sort_favorites_first_changed = nemo_list_view_sort_favorites_first_changed;
 	nemo_view_class->start_renaming_file = nemo_list_view_start_renaming_file;
@@ -4598,3 +4600,20 @@ nemo_list_view_update_filter_text (NemoView   *view,
     nemo_list_model_set_filter_active (list_view->details->model,
                                        filter_text != NULL && filter_text[0] != '\0');
 }
+
+static void
+nemo_list_view_select_first (NemoView *view)
+{
+    NemoListView *list_view = NEMO_LIST_VIEW (view);
+    GtkTreeModel *model = GTK_TREE_MODEL (list_view->details->model);
+    GtkTreeIter iter;
+    GtkTreePath *path;
+
+    if (!gtk_tree_model_get_iter_first (model, &iter)) {
+        return;
+    }
+
+    path = gtk_tree_model_get_path (model, &iter);
+    gtk_tree_view_set_cursor (list_view->details->tree_view, path, NULL, FALSE);
+    gtk_tree_path_free (path);
+}

src/nemo-view.c

@@ -10928,6 +10928,10 @@ apply_filter_debounce_cb (gpointer data)
     NEMO_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_filter_text (view, view->details->filter_text);
     nemo_view_apply_filter (view);
 
+    if (view->details->filter_active) {
+        NEMO_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_first (view);
+    }
+
     /* Re-emit so the slot can update the "no matching files" indicator
      * now that apply_filter has updated the view contents. */
     g_signal_emit (view, signals[ACTIVATE_FILTER], 0, view->details->filter_text);
@@ -11091,6 +11095,11 @@ real_update_filter_text (NemoView *view, const char *filter_text)
 {
 }
 
+static void
+real_select_first (NemoView *view)
+{
+}
+
 static void
 schedule_update_menus_callback (gpointer callback_data)
 {
@@ -11549,6 +11558,7 @@ nemo_view_class_init (NemoViewClass *klass)
         klass->unmerge_menus = real_unmerge_menus;
         klass->update_menus = real_update_menus;
 	klass->update_filter_text = real_update_filter_text;
+	klass->select_first = real_select_first;
 	klass->trash = real_trash;
 	klass->delete = real_delete;
 

src/nemo-view.h

@@ -317,6 +317,8 @@ struct NemoViewClass {
 	void    (* update_filter_text)             (NemoView *view,
 						   const char  *filter_text);
 
+	void    (* select_first)                   (NemoView *view);
+
         /* Signals used only for keybindings */
         gboolean (* trash)                         (NemoView *view);
         gboolean (* delete)                        (NemoView *view);