isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed ClutterReal; added clutter-units

Browse Source
This commit is contained in:
Tomas Frydrych
2007-05-22 09:31:40 +00:00
parent 8bbc7c27a8
commit a338a95796
24 changed files with 572 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-group.c
View File

@ -97,11 +97,11 @@ clutter_group_paint (ClutterActor *actor)
static void
clutter_group_request_coords (ClutterActor *self,
ClutterActorBoxReal *box)
ClutterActorBox *box)
{
ClutterActorBoxReal cbox;
ClutterActorBox cbox;
_clutter_actor_allocate_coords_real (self, &cbox);
clutter_actor_allocate_coords (self, &cbox);
/* Only positioning works.
* Sizing requests fail, use scale() instead
@ -112,7 +112,7 @@ clutter_group_request_coords (ClutterActor *self,
static void
clutter_group_allocate_coords (ClutterActor *self,
ClutterActorBoxReal *box)
ClutterActorBox *box)
{
ClutterGroupPrivate *priv;
GList *child_item;
@ -132,21 +132,19 @@ clutter_group_allocate_coords (ClutterActor *self,
/* Once added we include in sizing - doesn't matter if visible */
/* if (CLUTTER_ACTOR_IS_VISIBLE (child)) */
{
ClutterActorBoxReal cbox;
ClutterActorBox cbox;
_clutter_actor_allocate_coords_real (child, &cbox);
clutter_actor_allocate_coords (child, &cbox);
/* Ignore any children with offscreen ( negaive )
* positions.
*
* Also x1 and x2 will be set by parent caller.
*/
if (CLUTTER_REAL_EZ (box->x2) ||
CLUTTER_REAL_GT (cbox.x2, box->x2))
if (box->x2 == 0 || cbox.x2 > box->x2)
box->x2 = cbox.x2;
if (CLUTTER_REAL_EZ (box->y2) ||
CLUTTER_REAL_GT (cbox.y2, box->y2))
if (box->y2 == 0 || cbox.y2 > box->y2)
box->y2 = cbox.y2;
}
}