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

listview: Make the listitemmanager stricter

Browse Source 
Require that items created with the manager get destroyed via the
manager.

To that purpose, renamed create_list_item() to acquire_list_item() and
add a matching release_list_item() function.

This way, the manager can in the future keep track of all items and
cache information about them.
This commit is contained in:
Benjamin Otte 2018-09-21 05:32:00 +02:00 committed by Matthias Clasen
parent e1fa627158
commit 54042029d3
3 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtklistitemmanager.c
View File

@ -149,21 +149,27 @@ gtk_list_item_manager_model_changed (GtkListItemManager *self,
}
/*
* gtk_list_item_manager_create_list_item:
* gtk_list_item_manager_acquire_list_item:
* @self: a #GtkListItemManager
* @position: the row in the model to create a list item for
* @next_sibling: the widget this widget should be inserted before or %NULL
* if none
*
* Creates a new list item widget to use for @position. No widget may
* Creates a list item widget to use for @position. No widget may
* yet exist that is used for @position.
*
* When the returned item is no longer needed, the caller is responsible
* for calling gtk_list_item_manager_release_list_item().
* A particular case is when the row at @position is removed. In that case,
* all list items in the removed range must be released before
* gtk_list_item_manager_model_changed() is called.
*
* Returns: a properly setup widget to use in @position
**/
GtkWidget *
gtk_list_item_manager_create_list_item (GtkListItemManager *self,
guint position,
GtkWidget *next_sibling)
gtk_list_item_manager_acquire_list_item (GtkListItemManager *self,
guint position,
GtkWidget *next_sibling)
{
GtkListItem *result;
gpointer item;
@ -179,3 +185,22 @@ gtk_list_item_manager_create_list_item (GtkListItemManager *self,
return GTK_WIDGET (result);
}
/*
* gtk_list_item_manager_release_list_item:
* @self: a #GtkListItemManager
* @item: an item previously acquired with
* gtk_list_item_manager_acquire_list_item()
*
* Releases an item that was previously acquired via
* gtk_list_item_manager_acquire_list_item() and is no longer in use.
**/
void
gtk_list_item_manager_release_list_item (GtkListItemManager *self,
GtkWidget *item)
{
g_return_if_fail (GTK_IS_LIST_ITEM_MANAGER (self));
g_return_if_fail (GTK_IS_LIST_ITEM (item));
gtk_widget_unparent (item);
}

4
gtk/gtklistitemmanagerprivate.h
View File

@ -53,9 +53,11 @@ void gtk_list_item_manager_model_changed (GtkListItemMana
guint position,
guint removed,
guint added);
GtkWidget * gtk_list_item_manager_create_list_item (GtkListItemManager *self,
GtkWidget * gtk_list_item_manager_acquire_list_item (GtkListItemManager *self,
guint position,
GtkWidget *next_sibling);
void gtk_list_item_manager_release_list_item (GtkListItemManager *self,
GtkWidget *widget);
G_END_DECLS

10
gtk/gtklistview.c
View File

@ -125,7 +125,7 @@ list_row_clear (gpointer _row)
{
ListRow *row = _row;
g_clear_pointer (&row->widget, gtk_widget_unparent);
g_assert (row->widget == NULL);
}
static ListRow *
@ -454,6 +454,8 @@ gtk_list_view_remove_rows (GtkListView *self,
for (i = 0; i < n_rows; i++)
{
ListRow *next = gtk_rb_tree_node_get_next (row);
gtk_list_item_manager_release_list_item (self->item_manager, row->widget);
row->widget = NULL;
gtk_rb_tree_remove (self->rows, row);
row = next;
}
@ -487,9 +489,9 @@ gtk_list_view_add_rows (GtkListView *self,
new_row = gtk_rb_tree_insert_before (self->rows, row);
new_row->n_rows = 1;
new_row->widget = gtk_list_item_manager_create_list_item (self->item_manager,
position + i,
row ? row->widget : NULL);
new_row->widget = gtk_list_item_manager_acquire_list_item (self->item_manager,
position + i,
row ? row->widget : NULL);
}
gtk_widget_queue_resize (GTK_WIDGET (self));