isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-26 19:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[osx] Remove old units macros

Browse Source 
Remove the usage of CLUTTER_UNITS_* macros and at least get the
chance to make the OSX backend compile.

Hopefully, since I can't currently test it.
This commit is contained in:
Emmanuele Bassi 2009-07-13 16:53:06 +01:00
parent af5e432ba9
commit d59b9333a1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clutter/osx/clutter-stage-osx.c
View File

@ -376,13 +376,13 @@ clutter_stage_osx_get_preferred_width (ClutterActor *actor,
if (min_width_p) if (min_width_p)
{ {
if (is_resizable) if (is_resizable)
*min_width_p = CLUTTER_UNITS_FROM_FLOAT (1.0); *min_width_p = 1.0;
else else
*min_width_p = CLUTTER_UNITS_FROM_FLOAT (self->requisition_width); *min_width_p = self->requisition_width;
} }
if (natural_width_p) if (natural_width_p)
*natural_width_p = CLUTTER_UNITS_FROM_FLOAT (self->requisition_width); *natural_width_p = self->requisition_width;
CLUTTER_OSX_POOL_RELEASE(); CLUTTER_OSX_POOL_RELEASE();
} }
@ -403,13 +403,13 @@ clutter_stage_osx_get_preferred_height (ClutterActor *actor,
if (min_height_p) if (min_height_p)
{ {
if (is_resizable) if (is_resizable)
*min_height_p = CLUTTER_UNITS_FROM_FLOAT (1.0); *min_height_p = 1.0;
else else
*min_height_p = CLUTTER_UNITS_FROM_FLOAT (self->requisition_height); *min_height_p = self->requisition_height;
} }
if (natural_height_p) if (natural_height_p)
*natural_height_p = CLUTTER_UNITS_FROM_FLOAT (self->requisition_height); *natural_height_p = self->requisition_height;
CLUTTER_OSX_POOL_RELEASE(); CLUTTER_OSX_POOL_RELEASE();
} }
@ -423,13 +423,13 @@ clutter_stage_osx_allocate (ClutterActor *actor,
ClutterActorClass *parent_class; ClutterActorClass *parent_class;
CLUTTER_NOTE (BACKEND, "[%p], allocate: %d, %d - %d x %d", self, CLUTTER_NOTE (BACKEND, "[%p], allocate: %d, %d - %d x %d", self,
CLUTTER_UNITS_TO_INT (box->x1), (int) box->x1,
CLUTTER_UNITS_TO_INT (box->y1), (int) box->y1,
CLUTTER_UNITS_TO_INT (box->x2 - box->x1), (int) (box->x2 - box->x1),
CLUTTER_UNITS_TO_INT (box->y2 - box->y1)); (int) (box->y2 - box->y1));
self->requisition_width = CLUTTER_UNITS_TO_INT (box->x2 - box->x1); self->requisition_width = (int) (box->x2 - box->x1);
self->requisition_height = CLUTTER_UNITS_TO_INT (box->y2 - box->y1); self->requisition_height = (int) (box->y2 - box->y1);
if (CLUTTER_ACTOR_IS_REALIZED (actor)) if (CLUTTER_ACTOR_IS_REALIZED (actor))
{ {