nemo-list-view.c: When column expanders are disabled, don't check

subdir counts or set up tracking for children.

We were disabling the expanders in the widget, but not suppressing
the extra work involved in setting up or determining if a row
'would' have one if they were enabled.

Author: mtwebster

src/nemo-list-model.c

@@ -85,6 +85,7 @@ struct NemoListModelDetails {
 
 	GList *highlight_files;
     gboolean temp_unsorted;
+    gboolean expansion_enabled;
 };
 
 typedef struct {
@@ -1071,7 +1072,7 @@ nemo_list_model_add_file (NemoListModel *model, NemoFile *file,
 		gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
 	}
 
-    if (nemo_file_is_directory (file)) {
+    if (nemo_file_is_directory (file) && model->details->expansion_enabled) {
         guint count;
         gboolean got_count, unreadable;
 
@@ -1201,7 +1202,7 @@ nemo_list_model_file_changed (NemoListModel *model, NemoFile *file,
 
     gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
 
-    if (nemo_file_is_directory (file)) {
+    if (nemo_file_is_directory (file) && model->details->expansion_enabled) {
         if (update_dummy_row (model, file, g_sequence_get (ptr))) {
             gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (model),
                                                   path, &iter);
@@ -1892,3 +1893,9 @@ nemo_list_model_set_view_directory (NemoListModel *model, NemoDirectory *dir)
     model->details->view_dir = dir;
 }
 
+void
+nemo_list_model_set_expansion_enabled (NemoListModel *model, gboolean enabled)
+{
+    model->details->expansion_enabled = enabled;
+}
+

src/nemo-list-model.h

@@ -140,4 +140,5 @@ void              nemo_list_model_set_temporarily_disable_sort (NemoListModel *m
 gboolean          nemo_list_model_get_temporarily_disable_sort (NemoListModel *model);
 void              nemo_list_model_set_expanding                (NemoListModel *model, NemoDirectory *directory);
 void              nemo_list_model_set_view_directory           (NemoListModel *model, NemoDirectory *dir);
+void              nemo_list_model_set_expansion_enabled        (NemoListModel *model, gboolean enabled);
 #endif /* NEMO_LIST_MODEL_H */

src/nemo-list-view.c

@@ -34,6 +34,7 @@
 #include "nemo-view-dnd.h"
 #include "nemo-view-factory.h"
 #include "nemo-window.h"
+#include "nemo-window-slot.h"
 
 #include <string.h>
 #include <eel/eel-vfs-extensions.h>
@@ -283,13 +284,23 @@ tooltip_prefs_changed_callback (NemoListView *view)
 static void
 expanders_enabled_changed_cb (NemoListView *view)
 {
+    gboolean enabled;
+    NemoWindowSlot *slot;
+
     g_return_if_fail (NEMO_IS_LIST_VIEW (view));
     g_return_if_fail (GTK_IS_TREE_VIEW (view->details->tree_view) && view->details->tree_view != NULL);
 
+    enabled = g_settings_get_boolean (nemo_list_view_preferences,
+                                      NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION);
+
     gtk_tree_view_collapse_all (view->details->tree_view);
-    gtk_tree_view_set_show_expanders (view->details->tree_view,
-                                      g_settings_get_boolean (nemo_list_view_preferences,
-                                                             NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION));
+    gtk_tree_view_set_show_expanders (view->details->tree_view, enabled);
+    nemo_list_model_set_expansion_enabled (view->details->model, enabled);
+
+    slot = nemo_view_get_nemo_window_slot (NEMO_VIEW (view));
+    if (slot != NULL) {
+        nemo_window_slot_queue_reload (slot, FALSE);
+    }
 }
 
 static void
@@ -2599,6 +2610,10 @@ create_and_set_up_tree_view (NemoListView *view)
     g_signal_connect (view->details->tree_view, "size-allocate", G_CALLBACK (on_size_allocation_changed), view);
 
 	view->details->model = g_object_new (NEMO_TYPE_LIST_MODEL, NULL);
+    nemo_list_model_set_expansion_enabled (view->details->model,
+                                           g_settings_get_boolean (nemo_list_view_preferences,
+                                                                   NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION));
+
 	gtk_tree_view_set_model (view->details->tree_view, GTK_TREE_MODEL (view->details->model));
 	/* Need the model for the dnd drop icon "accept" change */
 	nemo_list_model_set_drag_view (NEMO_LIST_MODEL (view->details->model),