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

Merge branch 'wip/otte/for-master' into 'master'

Browse Source 
slicelistmodel: Fix two wrong computations

See merge request GNOME/gtk!1433
This commit is contained in:
Mohammed Sadiq 2020-02-14 02:39:21 +00:00
commit 22a6aaf4c5
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkslicelistmodel.c
View File

@ -133,7 +133,7 @@ gtk_slice_list_model_items_changed_cb (GListModel *model,
if (position < self->offset) if (position < self->offset)
{ {
guint skip = MIN (removed, added); guint skip = MIN (removed, added);
skip = MIN (skip, position - self->offset); skip = MIN (skip, self->offset - position);
position += skip; position += skip;
removed -= skip; removed -= skip;
@ -149,7 +149,7 @@ gtk_slice_list_model_items_changed_cb (GListModel *model,
g_assert (position >= self->offset); g_assert (position >= self->offset);
position -= self->offset; position -= self->offset;
changed = MIN (changed, self->size) - position; changed = MIN (changed, self->size - position);
g_list_model_items_changed (G_LIST_MODEL (self), position, changed, changed); g_list_model_items_changed (G_LIST_MODEL (self), position, changed, changed);
} }

40
testsuite/gtk/slicelistmodel.c
View File

@ -322,6 +322,44 @@ test_changes (void)
g_object_unref (slice); g_object_unref (slice);
} }
static void
test_bug_added_equals_removed (void)
{
GtkSliceListModel *slice;
GListStore *store;
store = new_store (1, 10, 1);
slice = new_model (store, 0, 10);
assert_model (slice, "1 2 3 4 5 6 7 8 9 10");
assert_changes (slice, "");
splice (store, 9, 1, (guint[]) { 11 }, 1);
assert_model (slice, "1 2 3 4 5 6 7 8 9 11");
assert_changes (slice, "9-1+1");
g_object_unref (store);
g_object_unref (slice);
}
static void
test_bug_skip_amount (void)
{
GtkSliceListModel *slice;
GListStore *store;
store = new_store (1, 5, 1);
slice = new_model (store, 2, 2);
assert_model (slice, "3 4");
assert_changes (slice, "");
splice (store, 0, 5, (guint[]) { 11, 12, 13, 14, 15 }, 5);
assert_model (slice, "13 14");
assert_changes (slice, "0-2+2");
g_object_unref (store);
g_object_unref (slice);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -338,6 +376,8 @@ main (int argc, char *argv[])
#if GLIB_CHECK_VERSION (2, 58, 0) /* g_list_store_splice() is broken before 2.58 */ #if GLIB_CHECK_VERSION (2, 58, 0) /* g_list_store_splice() is broken before 2.58 */
g_test_add_func ("/slicelistmodel/changes", test_changes); g_test_add_func ("/slicelistmodel/changes", test_changes);
#endif #endif
g_test_add_func ("/slicelistmodel/bug/added_equals_removed", test_bug_added_equals_removed);
g_test_add_func ("/slicelistmodel/bug/skip_amount", test_bug_skip_amount);
return g_test_run (); return g_test_run ();
} }