callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make computing and setting the visibility/filters atomic operations

Browse Source 
This way we remove paired function calls (compute/set pairs), and also make
it possible to avoid computing a filter twice, as setting the visibility
depends on filteredness.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero 2012-07-11 16:32:52 -05:00 committed by Matthias Clasen
parent 435ee7741c
commit cbb4ee4d55
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/gtkfilesystemmodel.c
View File

@ -307,17 +307,15 @@ emit_row_deleted_for_row (GtkFileSystemModel *model, guint row)
} }
static void static void
node_set_filtered_out (GtkFileSystemModel *model, guint id, gboolean filtered_out) node_set_visible_and_filtered_out (GtkFileSystemModel *model, guint id, gboolean visible, gboolean filtered_out)
{ {
FileModelNode *node = get_node (model, id); FileModelNode *node = get_node (model, id);
/* Filteredness */
node->filtered_out = filtered_out; node->filtered_out = filtered_out;
}
static void /* Visibility */
node_set_visible (GtkFileSystemModel *model, guint id, gboolean visible)
{
FileModelNode *node = get_node (model, id);
if (node->visible == visible || if (node->visible == visible ||
node->frozen_add) node->frozen_add)
@ -409,7 +407,7 @@ node_should_be_filtered_out (GtkFileSystemModel *model, guint id)
} }
static gboolean static gboolean
node_should_be_visible (GtkFileSystemModel *model, guint id) node_should_be_visible (GtkFileSystemModel *model, guint id, gboolean filtered_out)
{ {
FileModelNode *node = get_node (model, id); FileModelNode *node = get_node (model, id);
gboolean result; gboolean result;
@ -435,11 +433,23 @@ node_should_be_visible (GtkFileSystemModel *model, guint id)
return FALSE; return FALSE;
} }
result = !node_should_be_filtered_out (model, id); result = !filtered_out;
return result; return result;
} }
static void
node_compute_visibility_and_filters (GtkFileSystemModel *model, guint id)
{
gboolean filtered_out;
gboolean visible;
filtered_out = node_should_be_filtered_out (model, id);
visible = node_should_be_visible (model, id, filtered_out);
node_set_visible_and_filtered_out (model, id, visible, filtered_out);
}
/*** GtkTreeModel ***/ /*** GtkTreeModel ***/
static GtkTreeModelFlags static GtkTreeModelFlags
@ -1422,10 +1432,7 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model)
/* start at index 1, don't change the editable */ /* start at index 1, don't change the editable */
for (i = 1; i < model->files->len; i++) for (i = 1; i < model->files->len; i++)
{ node_compute_visibility_and_filters (model, i);
node_set_filtered_out (model, i, node_should_be_filtered_out (model, i));
node_set_visible (model, i, node_should_be_visible (model, i));
}
model->filter_on_thaw = FALSE; model->filter_on_thaw = FALSE;
_gtk_file_system_model_thaw_updates (model); _gtk_file_system_model_thaw_updates (model);
@ -1793,12 +1800,8 @@ add_file (GtkFileSystemModel *model,
g_slice_free1 (model->node_size, node); g_slice_free1 (model->node_size, node);
if (!model->frozen) if (!model->frozen)
{ node_compute_visibility_and_filters (model, model->files->len -1);
node_set_filtered_out (model, model->files->len -1,
node_should_be_filtered_out (model, model->files->len - 1));
node_set_visible (model, model->files->len -1,
node_should_be_visible (model, model->files->len - 1));
}
gtk_file_system_model_sort_node (model, model->files->len -1); gtk_file_system_model_sort_node (model, model->files->len -1);
} }
@ -1826,8 +1829,7 @@ remove_file (GtkFileSystemModel *model,
return; return;
node = get_node (model, id); node = get_node (model, id);
node_set_visible (model, id, FALSE); node_set_visible_and_filtered_out (model, id, FALSE, FALSE);
node_set_filtered_out (model, id, FALSE);
g_hash_table_remove (model->file_lookup, file); g_hash_table_remove (model->file_lookup, file);
g_object_unref (node->file); g_object_unref (node->file);
@ -1938,8 +1940,7 @@ _gtk_file_system_model_add_editable (GtkFileSystemModel *model, GtkTreeIter *ite
g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
g_return_if_fail (!get_node (model, 0)->visible); g_return_if_fail (!get_node (model, 0)->visible);
node_set_visible (model, 0, TRUE); node_set_visible_and_filtered_out (model, 0, TRUE, FALSE);
node_set_filtered_out (model, 0, FALSE);
ITER_INIT_FROM_INDEX (model, iter, 0); ITER_INIT_FROM_INDEX (model, iter, 0);
} }
@ -1957,8 +1958,7 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model)
g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model)); g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
g_return_if_fail (get_node (model, 0)->visible); g_return_if_fail (get_node (model, 0)->visible);
node_set_visible (model, 0, FALSE); node_set_visible_and_filtered_out (model, 0, FALSE, FALSE);
node_set_filtered_out (model, 0, FALSE);
} }
/** /**
@ -2015,8 +2015,7 @@ _gtk_file_system_model_thaw_updates (GtkFileSystemModel *model)
if (!node->frozen_add) if (!node->frozen_add)
continue; continue;
node->frozen_add = FALSE; node->frozen_add = FALSE;
node_set_visible (model, i, node_should_be_visible (model, i)); node_compute_visibility_and_filters (model, i);
node_set_filtered_out (model, i, node_should_be_filtered_out (model, i));
} }
} }
} }