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

inspector: Minor refactoring

Browse Source 
Break out some functions in prop-editor.c
This commit is contained in:
Matthias Clasen
2016-03-09 21:01:38 -05:00
parent c1c8a861aa
commit c24cc63523
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/inspector/prop-editor.c
View File

@ -1557,6 +1557,24 @@ typedef struct
gboolean running; gboolean running;
} GSettingsBinding; } GSettingsBinding;
static void
add_attribute_info (GtkInspectorPropEditor *editor,
GParamSpec *spec)
{
if (GTK_IS_CELL_RENDERER (editor->priv->object))
gtk_container_add (GTK_CONTAINER (editor),
attribute_editor (editor->priv->object, spec, editor));
}
static void
add_actionable_info (GtkInspectorPropEditor *editor)
{
if (GTK_IS_ACTIONABLE (editor->priv->object) &&
g_strcmp0 (editor->priv->name, "action-name") == 0)
gtk_container_add (GTK_CONTAINER (editor),
action_editor (editor->priv->object, editor));
}
static void static void
add_settings_info (GtkInspectorPropEditor *editor) add_settings_info (GtkInspectorPropEditor *editor)
{ {
@ -1694,10 +1712,9 @@ constructed (GObject *object)
can_modify = ((spec->flags & G_PARAM_WRITABLE) != 0 && can_modify = ((spec->flags & G_PARAM_WRITABLE) != 0 &&
(spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0); (spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0);
/* /* By reaching this, we already know the property is readable.
* By reaching this, we already know the property is readable. * Since all we can do for a GObject is dive down into it's properties
* Since all we can do for a GObject is dive down into it's properties and * and inspect bindings and such, pretend to be mutable.
* inspect bindings and such, pretend to be mutable.
*/ */
if (g_type_is_a (spec->value_type, G_TYPE_OBJECT)) if (g_type_is_a (spec->value_type, G_TYPE_OBJECT))
can_modify = TRUE; can_modify = TRUE;
@ -1709,15 +1726,8 @@ constructed (GObject *object)
gtk_widget_show (editor->priv->editor); gtk_widget_show (editor->priv->editor);
gtk_container_add (GTK_CONTAINER (editor), editor->priv->editor); gtk_container_add (GTK_CONTAINER (editor), editor->priv->editor);
if (GTK_IS_CELL_RENDERER (editor->priv->object)) add_attribute_info (editor, spec);
gtk_container_add (GTK_CONTAINER (editor), add_actionable_info (editor);
attribute_editor (editor->priv->object, spec, editor));
if (GTK_IS_ACTIONABLE (editor->priv->object) &&
g_strcmp0 (editor->priv->name, "action-name") == 0)
gtk_container_add (GTK_CONTAINER (editor),
action_editor (editor->priv->object, editor));
add_binding_info (editor); add_binding_info (editor);
add_settings_info (editor); add_settings_info (editor);
add_gtk_settings_info (editor); add_gtk_settings_info (editor);
@ -1817,7 +1827,7 @@ gtk_inspector_prop_editor_class_init (GtkInspectorPropEditorClass *klass)
NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); NULL, G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_IS_CHILD_PROPERTY, g_object_class_install_property (object_class, PROP_IS_CHILD_PROPERTY,
g_param_spec_boolean ("is-child-property", "Child property", "Child property", g_param_spec_boolean ("is-child-property", "Child property", "Whether this is a child property",
FALSE, G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); FALSE, G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
} }