isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-31 23:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Add CLUTTER_REQUEST_CONTENT_SIZE mode

Browse Source 
Some actors want to have a preferred size driven by their content, not
by their children or by their fixed size.

In order to achieve that, we can extend the ClutterRequestMode
enumeration so that clutter_actor_get_preferred_size() defers to the
ClutterContent's own preferred size.

https://bugzilla.gnome.org/show_bug.cgi?id=676326
This commit is contained in:
Emmanuele Bassi 2014-12-13 13:37:05 +00:00
parent e7d1458298
commit 300aa465c7
2 changed files with 83 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
clutter/clutter-actor.c
View File

@ -6578,7 +6578,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
* &min_height, * &min_height,
* &natural_height); * &natural_height);
* } * }
* else * else if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
* { * {
* clutter_actor_get_preferred_height (child, -1, * clutter_actor_get_preferred_height (child, -1,
* &min_height, * &min_height,
@ -6587,6 +6587,16 @@ clutter_actor_class_init (ClutterActorClass *klass)
* &min_width, * &min_width,
* &natural_width); * &natural_width);
* } * }
* else if (mode == CLUTTER_REQUEST_CONTENT_SIZE)
* {
* ClutterContent *content = clutter_actor_get_content (child);
*
* min_width, min_height = 0;
* natural_width = natural_height = 0;
*
* if (content != NULL)
* clutter_content_get_preferred_size (content, &natural_width, &natural_height);
* }
* ]| * ]|
* *
* will retrieve the minimum and natural width and height depending on the * will retrieve the minimum and natural width and height depending on the
@ -9038,7 +9048,7 @@ clutter_actor_get_preferred_size (ClutterActor *self,
&min_height, &min_height,
&natural_height); &natural_height);
} }
else else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
{ {
CLUTTER_NOTE (LAYOUT, "Preferred size (width-for-height)"); CLUTTER_NOTE (LAYOUT, "Preferred size (width-for-height)");
clutter_actor_get_preferred_height (self, -1, clutter_actor_get_preferred_height (self, -1,
@ -9048,6 +9058,17 @@ clutter_actor_get_preferred_size (ClutterActor *self,
&min_width, &min_width,
&natural_width); &natural_width);
} }
else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE)
{
CLUTTER_NOTE (LAYOUT, "Preferred size (content-size)");
if (priv->content != NULL)
clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
}
else
{
CLUTTER_NOTE (LAYOUT, "Unknown request mode");
}
if (min_width_p) if (min_width_p)
*min_width_p = min_width; *min_width_p = min_width;
@ -9689,6 +9710,14 @@ clutter_actor_adjust_allocation (ClutterActor *self,
&min_width, &min_width,
&nat_width); &nat_width);
} }
else if (req_mode == CLUTTER_REQUEST_CONTENT_SIZE)
{
min_width = min_height = 0;
nat_width = nat_height = 0;
if (self->priv->content != NULL)
clutter_content_get_preferred_size (self->priv->content, &nat_width, &nat_height);
}
#ifdef CLUTTER_ENABLE_DEBUG #ifdef CLUTTER_ENABLE_DEBUG
/* warn about underallocations */ /* warn about underallocations */
@ -10791,9 +10820,11 @@ clutter_actor_get_width (ClutterActor *self)
{ {
gfloat natural_width = 0; gfloat natural_width = 0;
if (self->priv->request_mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) if (priv->request_mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
clutter_actor_get_preferred_width (self, -1, NULL, &natural_width); {
else clutter_actor_get_preferred_width (self, -1, NULL, &natural_width);
}
else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
{ {
gfloat natural_height = 0; gfloat natural_height = 0;
@ -10802,6 +10833,10 @@ clutter_actor_get_width (ClutterActor *self)
NULL, NULL,
&natural_width); &natural_width);
} }
else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
{
clutter_content_get_preferred_size (priv->content, &natural_width, NULL);
}
return natural_width; return natural_width;
} }
@ -10855,8 +10890,14 @@ clutter_actor_get_height (ClutterActor *self)
clutter_actor_get_preferred_height (self, natural_width, clutter_actor_get_preferred_height (self, natural_width,
NULL, &natural_height); NULL, &natural_height);
} }
else else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
clutter_actor_get_preferred_height (self, -1, NULL, &natural_height); {
clutter_actor_get_preferred_height (self, -1, NULL, &natural_height);
}
else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
{
clutter_content_get_preferred_size (priv->content, NULL, &natural_height);
}
return natural_height; return natural_height;
} }
@ -15174,7 +15215,7 @@ clutter_actor_get_stage (ClutterActor *actor)
* &natural_height); * &natural_height);
* height = CLAMP (natural_height, min_height, available_height); * height = CLAMP (natural_height, min_height, available_height);
* } * }
* else * else if (request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
* { * {
* clutter_actor_get_preferred_height (self, available_width, * clutter_actor_get_preferred_height (self, available_width,
* &min_height, * &min_height,
@ -15186,6 +15227,13 @@ clutter_actor_get_stage (ClutterActor *actor)
* &natural_width); * &natural_width);
* width = CLAMP (natural_width, min_width, available_width); * width = CLAMP (natural_width, min_width, available_width);
* } * }
* else if (request_mode == CLUTTER_REQUEST_CONTENT_SIZE)
* {
* clutter_content_get_preferred_size (content, &natural_width, &natural_height);
*
* width = CLAMP (natural_width, 0, available_width);
* height = CLAMP (natural_height, 0, available_height);
* }
* *
* box.x1 = x; box.y1 = y; * box.x1 = x; box.y1 = y;
* box.x2 = box.x1 + available_width; * box.x2 = box.x1 + available_width;
@ -15244,6 +15292,16 @@ clutter_actor_allocate_available_size (ClutterActor *self,
&natural_width); &natural_width);
width = CLAMP (natural_width, min_width, available_width); width = CLAMP (natural_width, min_width, available_width);
break; break;
case CLUTTER_REQUEST_CONTENT_SIZE:
if (priv->content != NULL)
{
clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
width = CLAMP (natural_width, 0, available_width);
height = CLAMP (natural_height, 0, available_height);
}
break;
} }
@ -15409,7 +15467,7 @@ clutter_actor_allocate_align_fill (ClutterActor *self,
child_height = CLAMP (natural_height, min_height, available_height); child_height = CLAMP (natural_height, min_height, available_height);
} }
} }
else else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
{ {
gfloat min_width, natural_width; gfloat min_width, natural_width;
gfloat min_height, natural_height; gfloat min_height, natural_height;
@ -15432,6 +15490,18 @@ clutter_actor_allocate_align_fill (ClutterActor *self,
child_width = CLAMP (natural_width, min_width, available_width); child_width = CLAMP (natural_width, min_width, available_width);
} }
} }
else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
{
gfloat natural_width, natural_height;
clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
if (!x_fill)
child_width = CLAMP (natural_width, 0, available_width);
if (!y_fill)
child_height = CLAMP (natural_height, 0, available_height);
}
/* invert the horizontal alignment for RTL languages */ /* invert the horizontal alignment for RTL languages */
if (priv->text_direction == CLUTTER_TEXT_DIRECTION_RTL) if (priv->text_direction == CLUTTER_TEXT_DIRECTION_RTL)

5
clutter/clutter-enums.h
View File

@ -96,6 +96,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
* ClutterRequestMode: * ClutterRequestMode:
* @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests * @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests
* @CLUTTER_REQUEST_WIDTH_FOR_HEIGHT: Width for height requests * @CLUTTER_REQUEST_WIDTH_FOR_HEIGHT: Width for height requests
* @CLUTTER_REQUEST_CONTENT_SIZE: Use the preferred size of the
* #ClutterContent, if it has any (available since 1.22)
* *
* Specifies the type of requests for a #ClutterActor. * Specifies the type of requests for a #ClutterActor.
* *
@ -103,7 +105,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
*/ */
typedef enum { /*< prefix=CLUTTER_REQUEST >*/ typedef enum { /*< prefix=CLUTTER_REQUEST >*/
CLUTTER_REQUEST_HEIGHT_FOR_WIDTH, CLUTTER_REQUEST_HEIGHT_FOR_WIDTH,
CLUTTER_REQUEST_WIDTH_FOR_HEIGHT CLUTTER_REQUEST_WIDTH_FOR_HEIGHT,
CLUTTER_REQUEST_CONTENT_SIZE
} ClutterRequestMode; } ClutterRequestMode;
/** /**