callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inspector: Don't show internal build ids

Browse Source 
These ___object_x___ ids just clutter up the tree.
This commit is contained in:
Matthias Clasen
2014-05-15 15:24:44 -04:00
parent 75ecdf50a3
commit e170f31e2a
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/inspector/widget-tree.c
View File

@ -223,27 +223,33 @@ gtk_inspector_widget_tree_append_object (GtkInspectorWidgetTree *wt,
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path; GtkTreePath *path;
const gchar *class_name = G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)); const gchar *class_name;
gchar *address; gchar *address;
gboolean mapped; gboolean mapped;
ObjectData *od; ObjectData *od;
const gchar *label; const gchar *label;
label = NULL; if (GTK_IS_WIDGET (object))
mapped = FALSE; mapped = gtk_widget_get_mapped (GTK_WIDGET (object));
else
mapped = TRUE;
class_name = G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object));
if (GTK_IS_WIDGET (object)) if (GTK_IS_WIDGET (object))
{ {
GtkWidget *widget = GTK_WIDGET (object); const gchar *id;
if (name == NULL) id = gtk_widget_get_name (GTK_WIDGET (object));
name = gtk_widget_get_name (GTK_WIDGET (object)); if (name == NULL && id != NULL && g_strcmp0 (id, class_name) != 0)
mapped = gtk_widget_get_mapped (widget); name = id;
} }
if (name == NULL || g_strcmp0 (name, class_name) == 0)
{
if (GTK_IS_BUILDABLE (object)) if (GTK_IS_BUILDABLE (object))
name = gtk_buildable_get_name (GTK_BUILDABLE (object)); {
const gchar *id;
id = gtk_buildable_get_name (GTK_BUILDABLE (object));
if (name == NULL && id != NULL && !g_str_has_prefix (id, "___object_"))
name = id;
} }
if (name == NULL) if (name == NULL)
@ -269,7 +275,7 @@ gtk_inspector_widget_tree_append_object (GtkInspectorWidgetTree *wt,
OBJECT_NAME, name, OBJECT_NAME, name,
OBJECT_LABEL, label, OBJECT_LABEL, label,
OBJECT_ADDRESS, address, OBJECT_ADDRESS, address,
SENSITIVE, !GTK_IS_WIDGET (object) || mapped, SENSITIVE, mapped,
-1); -1);
od = g_new0 (ObjectData, 1); od = g_new0 (ObjectData, 1);