removed clutter_actor_get_abs_position_units() and clutter_actor_get_abs_size_units() from public api

This commit is contained in:
Tomas Frydrych 2007-05-23 10:47:35 +00:00
parent 5e5d0bfd66
commit 361cc36aaa
3 changed files with 46 additions and 44 deletions

View File

@ -1,3 +1,11 @@
2007-05-23 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.c:
* clutter/clutter-actor.h:
(clutter_actor_get_abs_size_units):
(clutter_actor_get_abs_position_units):
removed from public api
2007-05-22 Tomas Frydrych <tf@openedhand.com> 2007-05-22 Tomas Frydrych <tf@openedhand.com>
* configure.ac: * configure.ac:

View File

@ -1078,28 +1078,7 @@ clutter_actor_get_size (ClutterActor *self,
*height = clutter_actor_get_height (self); *height = clutter_actor_get_height (self);
} }
/** /*
* clutter_actor_get_abs_position
* @self: A #ClutterActor
* @x: Location to store x position if non NULL.
* @y: Location to store y position if non NULL.
*
* Gets the absolute position of an actor in pixels relative
* to the stage.
*/
void
clutter_actor_get_abs_position (ClutterActor *self,
gint *x,
gint *y)
{
gint32 xu, yu;
clutter_actor_get_abs_position_units (self, &xu, &yu);
*x = CLUTTER_UNITS_TO_INT (xu);
*y = CLUTTER_UNITS_TO_INT (yu);
}
/**
* clutter_actor_get_abs_position_units * clutter_actor_get_abs_position_units
* @self: A #ClutterActor * @self: A #ClutterActor
* @x: Location to store x position if non NULL. * @x: Location to store x position if non NULL.
@ -1110,7 +1089,7 @@ clutter_actor_get_abs_position (ClutterActor *self,
* *
* Since: 0.4 * Since: 0.4
*/ */
void static void
clutter_actor_get_abs_position_units (ClutterActor *self, clutter_actor_get_abs_position_units (ClutterActor *self,
gint32 *x, gint32 *x,
gint32 *y) gint32 *y)
@ -1153,27 +1132,27 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
} }
/** /**
* clutter_actor_get_abs_size: * clutter_actor_get_abs_position
* @self: A #ClutterActor * @self: A #ClutterActor
* @width: Location to store width if non NULL. * @x: Location to store x position if non NULL.
* @height: Location to store height if non NULL. * @y: Location to store y position if non NULL.
* *
* Gets the absolute size of an actor taking into account * Gets the absolute position of an actor in pixels relative
* an scaling factors * to the stage.
*/ */
void void
clutter_actor_get_abs_size (ClutterActor *self, clutter_actor_get_abs_position (ClutterActor *self,
guint *width, gint *x,
guint *height) gint *y)
{ {
gint32 wu, hu; gint32 xu, yu;
clutter_actor_get_abs_size_units (self, &wu, &hu); clutter_actor_get_abs_position_units (self, &xu, &yu);
*width = CLUTTER_UNITS_TO_INT (wu); *x = CLUTTER_UNITS_TO_INT (xu);
*height = CLUTTER_UNITS_TO_INT (hu); *y = CLUTTER_UNITS_TO_INT (yu);
} }
/** /*
* clutter_actor_get_abs_size_units: * clutter_actor_get_abs_size_units:
* @self: A #ClutterActor * @self: A #ClutterActor
* @width: Location to store width if non NULL. * @width: Location to store width if non NULL.
@ -1184,7 +1163,7 @@ clutter_actor_get_abs_size (ClutterActor *self,
* *
* Since: 0.4 * Since: 0.4
*/ */
void static void
clutter_actor_get_abs_size_units (ClutterActor *self, clutter_actor_get_abs_size_units (ClutterActor *self,
gint32 *width, gint32 *width,
gint32 *height) gint32 *height)
@ -1227,6 +1206,27 @@ clutter_actor_get_abs_size_units (ClutterActor *self,
while ((parent = clutter_actor_get_parent (parent)) != NULL); while ((parent = clutter_actor_get_parent (parent)) != NULL);
} }
/**
* clutter_actor_get_abs_size:
* @self: A #ClutterActor
* @width: Location to store width if non NULL.
* @height: Location to store height if non NULL.
*
* Gets the absolute size of an actor taking into account
* an scaling factors
*/
void
clutter_actor_get_abs_size (ClutterActor *self,
guint *width,
guint *height)
{
gint32 wu, hu;
clutter_actor_get_abs_size_units (self, &wu, &hu);
*width = CLUTTER_UNITS_TO_INT (wu);
*height = CLUTTER_UNITS_TO_INT (hu);
}
/** /**
* clutter_actor_get_width * clutter_actor_get_width

View File

@ -184,9 +184,6 @@ void clutter_actor_set_position (ClutterActor *sel
void clutter_actor_get_abs_position (ClutterActor *self, void clutter_actor_get_abs_position (ClutterActor *self,
gint *x, gint *x,
gint *y); gint *y);
void clutter_actor_get_abs_position_units (ClutterActor *self,
gint32 *x,
gint32 *y);
guint clutter_actor_get_width (ClutterActor *self); guint clutter_actor_get_width (ClutterActor *self);
guint clutter_actor_get_height (ClutterActor *self); guint clutter_actor_get_height (ClutterActor *self);
@ -261,9 +258,6 @@ void clutter_actor_scalex (ClutterActor *sel
void clutter_actor_get_abs_size (ClutterActor *self, void clutter_actor_get_abs_size (ClutterActor *self,
guint *width, guint *width,
guint *height); guint *height);
void clutter_actor_get_abs_size_units (ClutterActor *self,
gint32 *width,
gint32 *height);
void clutter_actor_get_size (ClutterActor *self, void clutter_actor_get_size (ClutterActor *self,
guint *width, guint *width,
guint *height); guint *height);