From bf46950a092f6e37028119a63dc39c6dce7bcf5b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 May 2014 23:15:34 -0400 Subject: [PATCH] inspector: Move scrolledwindow into prop list template --- modules/inspector/prop-list.c | 6 +- modules/inspector/prop-list.h | 4 +- modules/inspector/prop-list.ui | 144 ++++++++++++++++++--------------- modules/inspector/window.ui | 30 ++----- 4 files changed, 92 insertions(+), 92 deletions(-) diff --git a/modules/inspector/prop-list.c b/modules/inspector/prop-list.c index 6c78777ddc..68d507432f 100644 --- a/modules/inspector/prop-list.c +++ b/modules/inspector/prop-list.c @@ -53,9 +53,10 @@ struct _GtkInspectorPropListPrivate GtkCellRenderer *value_renderer; gboolean child_properties; GtkTreeViewColumn *attribute_column; + GtkWidget *tree; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorPropList, gtk_inspector_prop_list, GTK_TYPE_TREE_VIEW) +G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorPropList, gtk_inspector_prop_list, GTK_TYPE_BOX) static void gtk_inspector_prop_list_init (GtkInspectorPropList *pl) @@ -143,6 +144,7 @@ gtk_inspector_prop_list_class_init (GtkInspectorPropListClass *klass) gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, model); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, value_renderer); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, attribute_column); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, tree); } static void @@ -214,7 +216,7 @@ gtk_inspector_prop_list_prop_changed_cb (GObject *pspec, GParamSpec *prop, GtkInspectorPropList *pl) { - GtkTreeIter *iter = g_hash_table_lookup(pl->priv->prop_iters, prop->name); + GtkTreeIter *iter = g_hash_table_lookup (pl->priv->prop_iters, prop->name); if (iter != NULL) gtk_inspector_prop_list_update_prop (pl, iter, prop); diff --git a/modules/inspector/prop-list.h b/modules/inspector/prop-list.h index c9dc42caeb..6552c4ef61 100644 --- a/modules/inspector/prop-list.h +++ b/modules/inspector/prop-list.h @@ -38,13 +38,13 @@ typedef struct _GtkInspectorPropListPrivate GtkInspectorPropListPrivate; typedef struct _GtkInspectorPropList { - GtkTreeView parent; + GtkBox parent; GtkInspectorPropListPrivate *priv; } GtkInspectorPropList; typedef struct _GtkInspectorPropListClass { - GtkTreeViewClass parent; + GtkBoxClass parent; } GtkInspectorPropListClass; diff --git a/modules/inspector/prop-list.ui b/modules/inspector/prop-list.ui index 36c16dcf52..d477c75406 100644 --- a/modules/inspector/prop-list.ui +++ b/modules/inspector/prop-list.ui @@ -11,73 +11,89 @@ -