AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 19:00:12 +00:00
Code Issues Projects Releases Wiki Activity

inspector: Store the current node in the priv struct

Browse Source
This commit is contained in:
Benjamin Otte 2015-11-01 02:34:41 +01:00
parent b89939f5a4
commit e0f4bf5d35
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/inspector/css-node-tree.c
View File

@ -72,6 +72,7 @@ struct _GtkInspectorCssNodeTreePrivate
GtkWidget *prop_tree; GtkWidget *prop_tree;
GtkTreeViewColumn *prop_name_column; GtkTreeViewColumn *prop_name_column;
GHashTable *prop_iters; GHashTable *prop_iters;
GtkCssNode *node;
}; };
G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorCssNodeTree, gtk_inspector_css_node_tree, GTK_TYPE_BOX) G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorCssNodeTree, gtk_inspector_css_node_tree, GTK_TYPE_BOX)
@ -127,11 +128,25 @@ selection_changed (GtkTreeSelection *selection, GtkInspectorCssNodeTree *cnt)
populate_properties (cnt); populate_properties (cnt);
} }
static void
gtk_inspector_css_node_tree_unset_node (GtkInspectorCssNodeTree *cnt)
{
GtkInspectorCssNodeTreePrivate *priv = cnt->priv;
if (priv->node)
{
g_object_unref (priv->node);
priv->node = NULL;
}
}
static void static void
gtk_inspector_css_node_tree_finalize (GObject *object) gtk_inspector_css_node_tree_finalize (GObject *object)
{ {
GtkInspectorCssNodeTree *cnt = GTK_INSPECTOR_CSS_NODE_TREE (object); GtkInspectorCssNodeTree *cnt = GTK_INSPECTOR_CSS_NODE_TREE (object);
gtk_inspector_css_node_tree_unset_node (cnt);
g_hash_table_unref (cnt->priv->prop_iters); g_hash_table_unref (cnt->priv->prop_iters);
G_OBJECT_CLASS (gtk_inspector_css_node_tree_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_inspector_css_node_tree_parent_class)->finalize (object);
@ -341,6 +356,20 @@ static void
gtk_inspector_css_node_tree_set_node (GtkInspectorCssNodeTree *cnt, gtk_inspector_css_node_tree_set_node (GtkInspectorCssNodeTree *cnt,
GtkCssNode *node) GtkCssNode *node)
{ {
GtkInspectorCssNodeTreePrivate *priv = cnt->priv;
GtkCssStyle *style;
gint i;
if (priv->node == node)
return;
if (node)
g_object_ref (node);
gtk_inspector_css_node_tree_unset_node (cnt);
priv->node = node;
style = gtk_css_node_get_style (node); style = gtk_css_node_get_style (node);
for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++) for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++)
@ -383,8 +412,6 @@ populate_properties (GtkInspectorCssNodeTree *cnt)
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkTreeIter titer; GtkTreeIter titer;
GtkCssNode *node; GtkCssNode *node;
GtkCssStyle *style;
gint i;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->node_tree)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->node_tree));
if (!gtk_tree_selection_get_selected (selection, NULL, &titer)) if (!gtk_tree_selection_get_selected (selection, NULL, &titer))