[gtk/nbpage: 11/21] notebook: Add a pages model
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/nbpage: 11/21] notebook: Add a pages model
- Date: Thu, 21 Feb 2019 05:33:16 +0000 (UTC)
commit f11d0118a338af2b07c1bbfc8887c1ba07d539cf
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Feb 20 21:46:20 2019 -0500
notebook: Add a pages model
Just like GtkStack and GtkAssistant, provide
a list model with the page objects.
gtk/gtknotebook.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
gtk/gtknotebook.h | 2 +
2 files changed, 117 insertions(+)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 1566aacfb3..c9ea3bf72b 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -187,6 +187,8 @@ struct _GtkNotebookPrivate
GtkWidget *tabs_widget;
GtkWidget *arrow_widget[4];
+ GListModel *pages;
+
GList *children;
GList *first_tab; /* The first tab visible (for scrolling notebooks) */
GList *focus_tab;
@@ -269,6 +271,7 @@ enum {
PROP_PAGE,
PROP_ENABLE_POPUP,
PROP_GROUP_NAME,
+ PROP_PAGES,
LAST_PROP
};
@@ -1005,6 +1008,13 @@ gtk_notebook_class_init (GtkNotebookClass *class)
NULL,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+ properties[PROP_PAGES] =
+ g_param_spec_object ("pages",
+ P_("Pages"),
+ P_("The pages of the notebook."),
+ G_TYPE_LIST_MODEL,
+ GTK_PARAM_READABLE);
+
g_object_class_install_properties (gobject_class, LAST_PROP, properties);
gtk_container_class_install_child_property (container_class,
@@ -1790,6 +1800,9 @@ gtk_notebook_get_property (GObject *object,
case PROP_GROUP_NAME:
g_value_set_string (value, gtk_notebook_get_group_name (notebook));
break;
+ case PROP_PAGES:
+ g_value_set_object (value, gtk_notebook_get_pages (notebook));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -1829,6 +1842,9 @@ gtk_notebook_destroy (GtkWidget *widget)
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
+ if (priv->pages)
+ g_list_model_items_changed (G_LIST_MODEL (priv->pages), 0, g_list_length (priv->children), 0);
+
if (priv->menu)
gtk_notebook_popup_disable (notebook);
@@ -4274,6 +4290,9 @@ gtk_notebook_insert_notebook_page (GtkNotebook *notebook,
update_arrow_state (notebook);
+ if (priv->pages)
+ g_list_model_items_changed (priv->pages, position, 0, 1);
+
/* The page-added handler might have reordered the pages, re-get the position */
return gtk_notebook_page_num (notebook, page->child);
}
@@ -4394,6 +4413,7 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
gint need_resize = FALSE;
GtkWidget *tab_label;
gboolean destroying;
+ int position;
destroying = gtk_widget_in_destruction (GTK_WIDGET (notebook));
@@ -4434,6 +4454,8 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
page = list->data;
+ position = g_list_index (priv->children, page);
+
g_signal_handler_disconnect (page->child, page->notify_visible_handler);
if (gtk_widget_get_visible (page->child) &&
@@ -4477,6 +4499,9 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
gtk_notebook_update_labels (notebook);
if (need_resize)
gtk_widget_queue_resize (GTK_WIDGET (notebook));
+
+ if (priv->pages)
+ g_list_model_items_changed (priv->pages, position, 1, 0);
}
static void
@@ -7430,3 +7455,93 @@ gtk_notebook_page_get_child (GtkNotebookPage *page)
{
return page->child;
}
+
+#define GTK_TYPE_NOTEBOOK_PAGES (gtk_notebook_pages_get_type ())
+G_DECLARE_FINAL_TYPE (GtkNotebookPages, gtk_notebook_pages, GTK, NOTEBOOK_PAGES, GObject)
+
+struct _GtkNotebookPages
+{
+ GObject parent_instance;
+ GtkNotebook *notebook;
+};
+
+struct _GtkNotebookPagesClass
+{
+ GObjectClass parent_class;
+};
+
+static GType
+gtk_notebook_pages_get_item_type (GListModel *model)
+{
+ return GTK_TYPE_NOTEBOOK_PAGE;
+}
+
+static guint
+gtk_notebook_pages_get_n_items (GListModel *model)
+{
+ GtkNotebookPages *pages = GTK_NOTEBOOK_PAGES (model);
+
+ return g_list_length (pages->notebook->priv->children);
+}
+
+
+static gpointer
+gtk_notebook_pages_get_item (GListModel *model,
+ guint position)
+{
+ GtkNotebookPages *pages = GTK_NOTEBOOK_PAGES (model);
+ GtkNotebookPage *page;
+
+ page = g_list_nth_data (pages->notebook->priv->children, position);
+
+ return g_object_ref (page);
+}
+
+static void
+gtk_notebook_pages_list_model_init (GListModelInterface *iface)
+{
+ iface->get_item_type = gtk_notebook_pages_get_item_type;
+ iface->get_n_items = gtk_notebook_pages_get_n_items;
+ iface->get_item = gtk_notebook_pages_get_item;
+}
+G_DEFINE_TYPE_WITH_CODE (GtkNotebookPages, gtk_notebook_pages, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_notebook_pages_list_model_init))
+
+static void
+gtk_notebook_pages_init (GtkNotebookPages *pages)
+{
+}
+
+static void
+gtk_notebook_pages_class_init (GtkNotebookPagesClass *class)
+{
+}
+
+static GtkNotebookPages *
+gtk_notebook_pages_new (GtkNotebook *notebook)
+{
+ GtkNotebookPages *pages;
+
+ pages = g_object_new (GTK_TYPE_NOTEBOOK_PAGES, NULL);
+ pages->notebook = notebook;
+
+ return pages;
+}
+
+GListModel *
+gtk_notebook_get_pages (GtkNotebook *notebook)
+{
+ GtkNotebookPrivate *priv = notebook->priv;
+
+ g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
+
+ if (priv->pages)
+ return g_object_ref (priv->pages);
+
+ priv->pages = G_LIST_MODEL (gtk_notebook_pages_new (notebook));
+
+ g_object_add_weak_pointer (G_OBJECT (priv->pages), (gpointer *)&priv->pages);
+
+ return priv->pages;
+}
+
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index ec8e0681ff..c919e115cd 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -307,6 +307,8 @@ GtkNotebookPage *gtk_notebook_get_page (GtkNotebook *notebook,
GtkWidget *child);
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_notebook_page_get_child (GtkNotebookPage *page);
+GDK_AVAILABLE_IN_ALL
+GListModel *gtk_notebook_get_pages (GtkNotebook *notebook);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]