brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _clutter_actor_peek_layout_info

Browse Source 
This will be needed later to get a layout_info without creating one
if there is none already.
This commit is contained in:
Alexander Larsson 2012-06-07 16:31:22 +02:00
parent 1ab6fc0b39
commit 962bcb1222
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter-actor-private.h
View File

@ -177,6 +177,7 @@ struct _ClutterLayoutInfo
const ClutterLayoutInfo * _clutter_actor_get_layout_info_or_defaults (ClutterActor *self); const ClutterLayoutInfo * _clutter_actor_get_layout_info_or_defaults (ClutterActor *self);
ClutterLayoutInfo * _clutter_actor_get_layout_info (ClutterActor *self); ClutterLayoutInfo * _clutter_actor_get_layout_info (ClutterActor *self);
ClutterLayoutInfo * _clutter_actor_peek_layout_info (ClutterActor *self);
struct _ClutterTransformInfo struct _ClutterTransformInfo
{ {

20
clutter/clutter-actor.c
View File

@ -16371,6 +16371,22 @@ layout_info_free (gpointer data)
g_slice_free (ClutterLayoutInfo, data); g_slice_free (ClutterLayoutInfo, data);
} }
/*< private >
* _clutter_actor_peek_layout_info:
* @self: a #ClutterActor
*
* Retrieves a pointer to the ClutterLayoutInfo structure.
*
* If the actor does not have a ClutterLayoutInfo associated to it, %NULL is returned.
*
* Return value: (transfer none): a pointer to the ClutterLayoutInfo structure
*/
ClutterLayoutInfo *
_clutter_actor_peek_layout_info (ClutterActor *self)
{
return g_object_get_qdata (G_OBJECT (self), quark_actor_layout_info);
}
/*< private > /*< private >
* _clutter_actor_get_layout_info: * _clutter_actor_get_layout_info:
* @self: a #ClutterActor * @self: a #ClutterActor
@ -16392,7 +16408,7 @@ _clutter_actor_get_layout_info (ClutterActor *self)
{ {
ClutterLayoutInfo *retval; ClutterLayoutInfo *retval;
retval = g_object_get_qdata (G_OBJECT (self), quark_actor_layout_info); retval = _clutter_actor_peek_layout_info (self);
if (retval == NULL) if (retval == NULL)
{ {
retval = g_slice_new (ClutterLayoutInfo); retval = g_slice_new (ClutterLayoutInfo);
@ -16425,7 +16441,7 @@ _clutter_actor_get_layout_info_or_defaults (ClutterActor *self)
{ {
const ClutterLayoutInfo *info; const ClutterLayoutInfo *info;
info = g_object_get_qdata (G_OBJECT (self), quark_actor_layout_info); info = _clutter_actor_peek_layout_info (self);
if (info == NULL) if (info == NULL)
return &default_layout_info; return &default_layout_info;