isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 11:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

content: Make get_preferred_size() public

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-03-08 14:05:48 +00:00
parent 74765404dd
commit 546a14ec3b
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-actor.c
View File

@ -3205,6 +3205,9 @@ clutter_actor_paint_node (ClutterActor *actor,
{ {
ClutterActorPrivate *priv = actor->priv; ClutterActorPrivate *priv = actor->priv;
if (root == NULL)
return FALSE;
if (priv->bg_color_set && if (priv->bg_color_set &&
!clutter_color_equal (&priv->bg_color, CLUTTER_COLOR_Transparent)) !clutter_color_equal (&priv->bg_color, CLUTTER_COLOR_Transparent))
{ {
@ -17614,9 +17617,9 @@ clutter_actor_get_content_box (ClutterActor *self,
/* if the content does not have a preferred size then there is /* if the content does not have a preferred size then there is
* no point in computing the content box * no point in computing the content box
*/ */
if (!_clutter_content_get_preferred_size (priv->content, if (!clutter_content_get_preferred_size (priv->content,
&content_w, &content_w,
&content_h)) &content_h))
return; return;
clutter_actor_box_get_size (&priv->allocation, &alloc_w, &alloc_h); clutter_actor_box_get_size (&priv->allocation, &alloc_w, &alloc_h);

4
clutter/clutter-content-private.h
View File

@ -29,10 +29,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean _clutter_content_get_preferred_size (ClutterContent *content,
gfloat *width,
gfloat *height);
void _clutter_content_attached (ClutterContent *content, void _clutter_content_attached (ClutterContent *content,
ClutterActor *actor); ClutterActor *actor);
void _clutter_content_detached (ClutterContent *content, void _clutter_content_detached (ClutterContent *content,

14
clutter/clutter-content.c
View File

@ -275,8 +275,8 @@ _clutter_content_paint_content (ClutterContent *content,
CLUTTER_CONTENT_GET_IFACE (content)->paint_content (content, actor, node); CLUTTER_CONTENT_GET_IFACE (content)->paint_content (content, actor, node);
} }
/*< private > /**
* _clutter_content_get_preferred_size: * clutter_content_get_preferred_size:
* @content: a #ClutterContent * @content: a #ClutterContent
* @width: (out): return location for the natural width of the content * @width: (out): return location for the natural width of the content
* @height: (out): return location for the natural height of the content * @height: (out): return location for the natural height of the content
@ -289,12 +289,16 @@ _clutter_content_paint_content (ClutterContent *content,
* *
* Return value: %TRUE if the content has a preferred size, and %FALSE * Return value: %TRUE if the content has a preferred size, and %FALSE
* otherwise * otherwise
*
* Since: 1.10
*/ */
gboolean gboolean
_clutter_content_get_preferred_size (ClutterContent *content, clutter_content_get_preferred_size (ClutterContent *content,
gfloat *width, gfloat *width,
gfloat *height) gfloat *height)
{ {
g_return_val_if_fail (CLUTTER_IS_CONTENT (content), FALSE);
return CLUTTER_CONTENT_GET_IFACE (content)->get_preferred_size (content, return CLUTTER_CONTENT_GET_IFACE (content)->get_preferred_size (content,
width, width,
height); height);

3
clutter/clutter-content.h
View File

@ -90,6 +90,9 @@ struct _ClutterContentIface
GType clutter_content_get_type (void) G_GNUC_CONST; GType clutter_content_get_type (void) G_GNUC_CONST;
gboolean clutter_content_get_preferred_size (ClutterContent *content,
gfloat *width,
gfloat *height);
void clutter_content_invalidate (ClutterContent *content); void clutter_content_invalidate (ClutterContent *content);
G_END_DECLS G_END_DECLS