Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 906649
Collapse All | Expand All

(-)a/gtk/gtktreelistmodel.c (-1 / +1 lines)
Lines 357-363 gtk_tree_list_model_items_changed_cb (GListModel *model, Link Here
357
    }
357
    }
358
358
359
  tree_added = added;
359
  tree_added = added;
360
  for (i = 0; i < added; i++)
360
  for (i = added; i-- > 0;)
361
    {
361
    {
362
      child = gtk_rb_tree_insert_before (node->children, child);
362
      child = gtk_rb_tree_insert_before (node->children, child);
363
      child->parent = node;
363
      child->parent = node;
(-)a/testsuite/gtk/treelistmodel.c (-1 / +46 lines)
Lines 261-266 test_remove_some (void) Link Here
261
  g_object_unref (tree);
261
  g_object_unref (tree);
262
}
262
}
263
263
264
static void
265
splice (GListStore *store,
266
        guint       pos,
267
        guint       removed,
268
        guint      *numbers,
269
        guint       added)
270
{
271
  GObject **objects = g_newa (GObject *, added);
272
  guint i;
273
274
  for (i = 0; i < added; i++)
275
    {
276
      /* 0 cannot be differentiated from NULL, so don't use it */
277
      g_assert_cmpint (numbers[i], !=, 0);
278
      objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
279
      g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
280
    }
281
282
  g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
283
284
  for (i = 0; i < added; i++)
285
    g_object_unref (objects[i]);
286
}
287
288
static void
289
test_splice (void)
290
{
291
  GtkTreeListModel *tree = new_model (100, TRUE);
292
  gpointer item;
293
294
  assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
295
  assert_changes (tree, "");
296
297
  item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
298
  g_assert_true (G_IS_LIST_MODEL (item));
299
  splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
300
  /* expected */
301
  assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
302
  /* real outcome */
303
  // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
304
  assert_changes (tree, "2-5+5");
305
306
  g_object_unref (tree);
307
}
308
264
/* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
309
/* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
265
typedef struct _DemoNode DemoNode;
310
typedef struct _DemoNode DemoNode;
266
311
Lines 391-396 main (int argc, char *argv[]) Link Here
391
436
392
  g_test_add_func ("/treelistmodel/expand", test_expand);
437
  g_test_add_func ("/treelistmodel/expand", test_expand);
393
  g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
438
  g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
439
  g_test_add_func ("/treelistmodel/remove_splice", test_splice);
394
  g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
440
  g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
395
441
396
  return g_test_run ();
442
  return g_test_run ();
397
- 

Return to bug 906649