Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

listitemmanager: Make sections configurable

Browse Source 
Add a gtk_list_item_manager_set_has_sections() (default: FALSE) that
requires explicit turning on for the listitemmanager to gain section
support.
This commit is contained in:
Benjamin Otte
2023-04-09 05:29:14 +02:00
parent 3353a0836b
commit c25d0bbac3
3 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
gtk/gtklistitemmanager.c
View File

@@ -32,6 +32,7 @@ struct _GtkListItemManager
GtkWidget *widget;
GtkSelectionModel *model;
gboolean has_sections;
GtkRbTree *items;
GSList *trackers;
@@ -182,7 +183,7 @@ gtk_list_item_manager_new (GtkWidget *widget,
static gboolean
gtk_list_item_manager_has_sections (GtkListItemManager *self)
{
if (self->model == NULL)
if (self->model == NULL || !self->has_sections)
return FALSE;
return GTK_IS_SECTION_MODEL (self->model);
@@ -1566,6 +1567,84 @@ gtk_list_item_manager_get_model (GtkListItemManager *self)
return self->model;
}
void
gtk_list_item_manager_set_has_sections (GtkListItemManager *self,
gboolean has_sections)
{
GtkListTile *tile;
gboolean had_sections;
if (self->has_sections == has_sections)
return;
had_sections = gtk_list_item_manager_has_sections (self);
self->has_sections = has_sections;
if (!had_sections && gtk_list_item_manager_has_sections (self))
{
tile = gtk_rb_tree_get_first (self->items);
if (tile && tile->type != GTK_LIST_TILE_HEADER && tile->type != GTK_LIST_TILE_UNMATCHED_HEADER)
tile = gtk_list_tile_get_next_skip (tile);
if (tile)
gtk_list_tile_set_type (tile, GTK_LIST_TILE_UNMATCHED_HEADER);
tile = gtk_rb_tree_get_last (self->items);
if (tile && tile->type != GTK_LIST_TILE_FOOTER && tile->type != GTK_LIST_TILE_UNMATCHED_FOOTER)
tile = gtk_list_tile_get_previous_skip (tile);
if (tile)
gtk_list_tile_set_type (tile, GTK_LIST_TILE_UNMATCHED_FOOTER);
}
else if (had_sections && !gtk_list_item_manager_has_sections (self))
{
GtkListTile *header = NULL, *footer = NULL;
for (tile = gtk_rb_tree_get_first (self->items);
tile;
tile = gtk_list_tile_get_next_skip (tile))
{
switch (tile->type)
{
case GTK_LIST_TILE_HEADER:
case GTK_LIST_TILE_UNMATCHED_HEADER:
if (!header)
header = tile;
else
gtk_list_tile_set_type (tile, GTK_LIST_TILE_REMOVED);
break;
case GTK_LIST_TILE_FOOTER:
case GTK_LIST_TILE_UNMATCHED_FOOTER:
if (footer)
gtk_list_tile_set_type (footer, GTK_LIST_TILE_REMOVED);
footer = tile;
break;
case GTK_LIST_TILE_ITEM:
case GTK_LIST_TILE_FILLER:
case GTK_LIST_TILE_REMOVED:
break;
default:
g_assert_not_reached ();
break;
}
}
if (header)
{
gtk_list_tile_set_type (header, GTK_LIST_TILE_HEADER);
gtk_list_tile_set_type (footer, GTK_LIST_TILE_FOOTER);
}
}
gtk_list_item_manager_ensure_items (self, NULL, G_MAXUINT);
gtk_widget_queue_resize (self->widget);
}
gboolean
gtk_list_item_manager_get_has_sections (GtkListItemManager *self)
{
return self->has_sections;
}
/*
* gtk_list_item_manager_acquire_list_item:
* @self: a `GtkListItemManager`

3
gtk/gtklistitemmanagerprivate.h
View File

@@ -121,6 +121,9 @@ GtkListTile * gtk_list_tile_gc (GtkListItemMana
void gtk_list_item_manager_set_model (GtkListItemManager *self,
GtkSelectionModel *model);
GtkSelectionModel * gtk_list_item_manager_get_model (GtkListItemManager *self);
void gtk_list_item_manager_set_has_sections (GtkListItemManager *self,
gboolean has_sections);
gboolean gtk_list_item_manager_get_has_sections (GtkListItemManager *self);
GtkListItemTracker * gtk_list_item_tracker_new (GtkListItemManager *self);
void gtk_list_item_tracker_free (GtkListItemManager *self,

11
testsuite/gtk/listitemmanager.c
View File

@@ -372,7 +372,7 @@ test_exhaustive (void)
if (g_test_verbose ())
print_list_item_manager_tiles (items);
switch (g_test_rand_int_range (0, 5))
switch (g_test_rand_int_range (0, 6))
{
case 0:
if (g_test_verbose ())
@@ -413,6 +413,15 @@ test_exhaustive (void)
}
break;
case 5:
{
gboolean has_sections = g_test_rand_bit ();
if (g_test_verbose ())
g_test_message ("Setting has_sections to %s", has_sections ? "true" : "false");
gtk_list_item_manager_set_has_sections (items, has_sections);
}
break;
default:
g_assert_not_reached ();
break;