From 53c63673e42cf829fcd99d95bc7a2729794aef29 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 20 May 2023 16:45:19 -0400 Subject: [PATCH] gridview: Use gtk_list_item_manager_gc_tiles This simplifies the code a bit. --- gtk/gtkgridview.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c index 9408e16123..dd36309844 100644 --- a/gtk/gtkgridview.c +++ b/gtk/gtkgridview.c @@ -756,8 +756,10 @@ gtk_grid_view_size_allocate (GtkWidget *widget, min_row_height = ceil ((double) height / GTK_GRID_VIEW_MAX_VISIBLE_ROWS); gtk_list_base_get_border_spacing (GTK_LIST_BASE (self), &xspacing, &yspacing); + gtk_list_item_manager_gc_tiles (self->item_manager); + /* step 0: exit early if list is empty */ - tile = gtk_list_tile_gc (self->item_manager, gtk_list_item_manager_get_first (self->item_manager)); + tile = gtk_list_item_manager_get_first (self->item_manager); if (tile == NULL) { gtk_list_base_allocate (GTK_LIST_BASE (self)); @@ -776,9 +778,7 @@ gtk_grid_view_size_allocate (GtkWidget *widget, /* step 2: determine height of known rows */ heights = g_array_new (FALSE, FALSE, sizeof (int)); - for (; - tile != NULL; - tile = gtk_list_tile_gc (self->item_manager, tile)) + while (tile != NULL) { /* if it's a multirow tile, handle it here */ if (tile->n_items > 1 && tile->n_items >= self->n_columns) @@ -795,7 +795,7 @@ gtk_grid_view_size_allocate (GtkWidget *widget, for (i = 0, start = tile; i < self->n_columns && tile != NULL; - tile = gtk_list_tile_gc (self->item_manager, gtk_rb_tree_node_get_next (tile))) + tile = gtk_rb_tree_node_get_next (tile)) { if (tile->widget) { -- 2.30.2