AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

filterlistmodel: Don't filter out every 513th element

Browse Source 
Incremental filtering would skip every 513th element due to an
off-by-one error.

Test included
This commit is contained in:
Benjamin Otte 2020-07-09 22:22:04 +02:00
parent 817da34f7e
commit 986f721938
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkfilterlistmodel.c
View File

@ -178,7 +178,7 @@ gtk_filter_list_model_run_filter (GtkFilterListModel *self,
}
if (more)
gtk_bitset_remove_range_closed (self->pending, 0, pos);
gtk_bitset_remove_range_closed (self->pending, 0, pos - 1);
else
g_clear_pointer (&self->pending, gtk_bitset_unref);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PENDING]);

33
testsuite/gtk/filterlistmodel.c
View File

@ -88,6 +88,11 @@ add (GListStore *store,
g_string_set_size (changes, 0); \
}G_STMT_END
#define ignore_changes(model) G_STMT_START{ \
GString *changes = g_object_get_qdata (G_OBJECT (model), changes_quark); \
g_string_set_size (changes, 0); \
}G_STMT_END
static GListStore *
new_empty_store (void)
{
@ -345,6 +350,33 @@ test_change_filter (void)
g_object_unref (filter);
}
static void
test_incremental (void)
{
GtkFilterListModel *filter;
GtkFilter *custom;
/* everything is filtered */
filter = new_model (1000, is_larger_than, GUINT_TO_POINTER (10000));
gtk_filter_list_model_set_incremental (filter, TRUE);
assert_model (filter, "");
assert_changes (filter, "");
custom = gtk_custom_filter_new (is_near, GUINT_TO_POINTER (512), NULL);
gtk_filter_list_model_set_filter (filter, custom);
g_object_unref (custom);
assert_model (filter, "");
assert_changes (filter, "");
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
assert_model (filter, "510 511 512 513 514");
/* implementation detail */
ignore_changes (filter);
g_object_unref (filter);
}
int
main (int argc, char *argv[])
{
@ -357,6 +389,7 @@ main (int argc, char *argv[])
g_test_add_func ("/filterlistmodel/create", test_create);
g_test_add_func ("/filterlistmodel/empty_set_filter", test_empty_set_filter);
g_test_add_func ("/filterlistmodel/change_filter", test_change_filter);
g_test_add_func ("/filterlistmodel/incremental", test_incremental);
return g_test_run ();
}