[gtk+] listbox: Implement gtk_list_box_insert()
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] listbox: Implement gtk_list_box_insert()
- Date: Thu, 8 Aug 2013 09:12:53 +0000 (UTC)
commit 43c68e118f88593f404d6eaa3d11ab821088b8c3
Author: Kalev Lember <kalevlember gmail com>
Date: Wed Aug 7 12:36:03 2013 +0200
listbox: Implement gtk_list_box_insert()
... to make it possible to insert rows in the middle of the list without having
to fiddle with the sort functions. One of the first users is going to be Glade.
https://bugzilla.gnome.org/show_bug.cgi?id=705558
docs/reference/gtk/gtk3-sections.txt | 1 +
gtk/gtklistbox.c | 41 +++++++++++++++++++++++++++------
gtk/gtklistbox.h | 4 +++
3 files changed, 38 insertions(+), 8 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 491e1e9..9da9ada 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -511,6 +511,7 @@ GtkListBoxUpdateHeaderFunc
gtk_list_box_new
gtk_list_box_prepend
+gtk_list_box_insert
gtk_list_box_select_row
gtk_list_box_get_selected_row
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 8777ffc..79c4403 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -1671,15 +1671,33 @@ gtk_list_box_row_visibility_changed (GtkListBox *list_box,
}
}
-static void
-gtk_list_box_add_row (GtkListBox *list_box,
- GtkWidget *child,
- gboolean prepend)
+/**
+ * gtk_list_box_insert:
+ * @list_box: a #GtkListBox.
+ * @child: the #GtkWidget to add
+ * @position: the position to insert @child in
+ *
+ * Insert the @child into the @list_box at @position. If a sort function is
+ * set, the widget will actually be inserted at the calculated position and
+ * this function has the same effect of gtk_container_add().
+ *
+ * If @position is -1, or larger than the total number of items in the
+ * @list_box, then the @child will be appended to the end.
+ *
+ * Since: 3.10
+ */
+void
+gtk_list_box_insert (GtkListBox *list_box,
+ GtkWidget *child,
+ gint position)
{
GtkListBoxPrivate *priv = gtk_list_box_get_instance_private (list_box);
GtkListBoxRow *row;
GSequenceIter* iter = NULL;
+ g_return_if_fail (list_box != NULL);
+ g_return_if_fail (child != NULL);
+
if (GTK_IS_LIST_BOX_ROW (child))
row = GTK_LIST_BOX_ROW (child);
else
@@ -1692,10 +1710,17 @@ gtk_list_box_add_row (GtkListBox *list_box,
if (priv->sort_func != NULL)
iter = g_sequence_insert_sorted (priv->children, row,
(GCompareDataFunc)do_sort, list_box);
- else if (prepend)
+ else if (position == 0)
iter = g_sequence_prepend (priv->children, row);
- else
+ else if (position == -1)
iter = g_sequence_append (priv->children, row);
+ else
+ {
+ GSequenceIter *current_iter;
+
+ current_iter = g_sequence_get_iter_at_pos (priv->children, position);
+ iter = g_sequence_insert_before (current_iter, row);
+ }
ROW_PRIV (row)->iter = iter;
gtk_widget_set_parent (GTK_WIDGET (row), GTK_WIDGET (list_box));
@@ -1716,7 +1741,7 @@ static void
gtk_list_box_real_add (GtkContainer *container,
GtkWidget *child)
{
- gtk_list_box_add_row (GTK_LIST_BOX (container), child, FALSE);
+ gtk_list_box_insert (GTK_LIST_BOX (container), child, -1);
}
static void
@@ -2069,7 +2094,7 @@ void
gtk_list_box_prepend (GtkListBox *list_box,
GtkWidget *child)
{
- gtk_list_box_add_row (list_box, child, TRUE);
+ gtk_list_box_insert (list_box, child, 0);
}
/**
diff --git a/gtk/gtklistbox.h b/gtk/gtklistbox.h
index d537d7d..f0e569c 100644
--- a/gtk/gtklistbox.h
+++ b/gtk/gtklistbox.h
@@ -164,6 +164,10 @@ GDK_AVAILABLE_IN_3_10
void gtk_list_box_prepend (GtkListBox *list_box,
GtkWidget *child);
GDK_AVAILABLE_IN_3_10
+void gtk_list_box_insert (GtkListBox *list_box,
+ GtkWidget *child,
+ gint position);
+GDK_AVAILABLE_IN_3_10
GtkListBoxRow* gtk_list_box_get_selected_row (GtkListBox *list_box);
GDK_AVAILABLE_IN_3_10
GtkListBoxRow* gtk_list_box_get_row_at_index (GtkListBox *list_box,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]