2007-07-28 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.[ch]: Use GInitiallyUnowned as the parent structure in the ClutterActor structure definition; somehow, this has escaped everyone attention in one year and a half. Luckily, GInitiallyUnowned is as big as GObject. (clutter_actor_get_abs_position_units), (clutter_actor_get_abs_position): Check parameters. * clutter/clutter-texture.h: Unmangle the flags enum type declaration, so that dumb parsers like h2defs.py are not fooled. * clutter/clutter-behaviour-ellipse.[ch]: * clutter/clutter-effect.c: Fix some documentation issues and make gtk-doc happy.
This commit is contained in:
parent
29859bb8ca
commit
ad64200aa7
19
ChangeLog
19
ChangeLog
@ -1,3 +1,22 @@
|
|||||||
|
2007-07-28 Emmanuele Bassi <ebassi@openedhand.com>
|
||||||
|
|
||||||
|
* clutter/clutter-actor.[ch]: Use GInitiallyUnowned
|
||||||
|
as the parent structure in the ClutterActor structure
|
||||||
|
definition; somehow, this has escaped everyone attention
|
||||||
|
in one year and a half. Luckily, GInitiallyUnowned is
|
||||||
|
as big as GObject.
|
||||||
|
|
||||||
|
(clutter_actor_get_abs_position_units),
|
||||||
|
(clutter_actor_get_abs_position): Check parameters.
|
||||||
|
|
||||||
|
* clutter/clutter-texture.h: Unmangle the flags enum
|
||||||
|
type declaration, so that dumb parsers like h2defs.py
|
||||||
|
are not fooled.
|
||||||
|
|
||||||
|
* clutter/clutter-behaviour-ellipse.[ch]:
|
||||||
|
* clutter/clutter-effect.c: Fix some documentation
|
||||||
|
issues and make gtk-doc happy.
|
||||||
|
|
||||||
2007-07-27 Tomas Frydrych <tf@openedhand.com>
|
2007-07-27 Tomas Frydrych <tf@openedhand.com>
|
||||||
|
|
||||||
* clutter/clutter-behaviour-ellipse.h:
|
* clutter/clutter-behaviour-ellipse.h:
|
||||||
|
@ -1431,12 +1431,16 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
|
|||||||
{
|
{
|
||||||
ClutterVertex v1;
|
ClutterVertex v1;
|
||||||
ClutterVertex v2;
|
ClutterVertex v2;
|
||||||
|
|
||||||
|
g_return_if_fail (CLUTTER_IS_ACTOR (self));
|
||||||
|
|
||||||
v1.x = v1.y = v1.z = 0;
|
v1.x = v1.y = v1.z = 0;
|
||||||
clutter_actor_apply_transform_to_point (self, &v1, &v2);
|
clutter_actor_apply_transform_to_point (self, &v1, &v2);
|
||||||
|
|
||||||
*x = v2.x;
|
if (x)
|
||||||
*y = v2.y;
|
*x = v2.x;
|
||||||
|
if (y)
|
||||||
|
*y = v2.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1450,14 +1454,20 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_actor_get_abs_position (ClutterActor *self,
|
clutter_actor_get_abs_position (ClutterActor *self,
|
||||||
gint *x,
|
gint *x,
|
||||||
gint *y)
|
gint *y)
|
||||||
{
|
{
|
||||||
gint32 xu, yu;
|
ClutterUnit xu, yu;
|
||||||
|
|
||||||
|
g_return_if_fail (CLUTTER_IS_ACTOR (self));
|
||||||
|
|
||||||
|
xu = yu = 0;
|
||||||
clutter_actor_get_abs_position_units (self, &xu, &yu);
|
clutter_actor_get_abs_position_units (self, &xu, &yu);
|
||||||
|
|
||||||
*x = CLUTTER_UNITS_TO_INT (xu);
|
if (x)
|
||||||
*y = CLUTTER_UNITS_TO_INT (yu);
|
*x = CLUTTER_UNITS_TO_INT (xu);
|
||||||
|
if (y)
|
||||||
|
*y = CLUTTER_UNITS_TO_INT (yu);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -111,7 +111,7 @@ GType clutter_actor_box_get_type (void) G_GNUC_CONST;
|
|||||||
struct _ClutterActor
|
struct _ClutterActor
|
||||||
{
|
{
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
GObject parent_instance;
|
GInitiallyUnowned parent_instance;
|
||||||
|
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
guint32 flags;
|
guint32 flags;
|
||||||
@ -124,7 +124,7 @@ struct _ClutterActor
|
|||||||
|
|
||||||
struct _ClutterActorClass
|
struct _ClutterActorClass
|
||||||
{
|
{
|
||||||
GObjectClass parent_class;
|
GInitiallyUnownedClass parent_class;
|
||||||
|
|
||||||
void (* show) (ClutterActor *actor);
|
void (* show) (ClutterActor *actor);
|
||||||
void (* show_all) (ClutterActor *actor);
|
void (* show_all) (ClutterActor *actor);
|
||||||
|
@ -992,7 +992,7 @@ clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
|
|||||||
/**
|
/**
|
||||||
* clutter_behaviour_ellipse_get_angle_tiltx
|
* clutter_behaviour_ellipse_get_angle_tiltx
|
||||||
* @self: a #ClutterBehaviourEllipse
|
* @self: a #ClutterBehaviourEllipse
|
||||||
* @self: a #ClutterRotateAxis
|
* @axis: a #ClutterRotateAxis
|
||||||
*
|
*
|
||||||
* Gets the tilt of the ellipse around the center in the given axis.
|
* Gets the tilt of the ellipse around the center in the given axis.
|
||||||
*
|
*
|
||||||
|
@ -135,18 +135,18 @@ ClutterAngle clutter_behaviour_ellipse_get_angle_endx (ClutterBeha
|
|||||||
gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
|
gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
|
||||||
|
|
||||||
void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
|
void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
|
||||||
ClutterRotateAxis,
|
ClutterRotateAxis axis,
|
||||||
ClutterAngle angle_tilt);
|
ClutterAngle angle_tilt);
|
||||||
|
|
||||||
void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
|
void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
|
||||||
ClutterRotateAxis,
|
ClutterRotateAxis axis,
|
||||||
gdouble angle_tilt);
|
gdouble angle_tilt);
|
||||||
|
|
||||||
ClutterAngle clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
|
ClutterAngle clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
|
||||||
ClutterRotateAxis);
|
ClutterRotateAxis axis);
|
||||||
|
|
||||||
gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
|
gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
|
||||||
ClutterRotateAxis);
|
ClutterRotateAxis axis);
|
||||||
|
|
||||||
void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
|
void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
|
||||||
gdouble angle_tilt_x,
|
gdouble angle_tilt_x,
|
||||||
|
@ -657,7 +657,7 @@ clutter_effect_rotate_y (ClutterEffectTemplate *template_,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clutter_effect_rotate_y:
|
* clutter_effect_rotate_z:
|
||||||
* @template_: A #ClutterEffectTemplate
|
* @template_: A #ClutterEffectTemplate
|
||||||
* @actor: A #ClutterActor to apply the effect to.
|
* @actor: A #ClutterActor to apply the effect to.
|
||||||
* @angle_begin: Initial angle to apply to actor
|
* @angle_begin: Initial angle to apply to actor
|
||||||
|
@ -75,11 +75,11 @@ struct _ClutterTextureClass
|
|||||||
void (*_clutter_texture6) (void);
|
void (*_clutter_texture6) (void);
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum ClutterTextureFlags
|
typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
|
||||||
{
|
CLUTTER_TEXTURE_RGB_FLAG_BGR = 1 << 1,
|
||||||
CLUTTER_TEXTURE_RGB_FLAG_BGR = (1 << 1),
|
CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */
|
||||||
CLUTTER_TEXTURE_RGB_FLAG_PREMULT = (1 << 2), /* FIXME: not handled */
|
CLUTTER_TEXTURE_YUV_FLAG_YUV2 = 1 << 3
|
||||||
CLUTTER_TEXTURE_YUV_FLAG_YUV2 = (1 << 3)
|
|
||||||
/* FIXME: add compressed types ? */
|
/* FIXME: add compressed types ? */
|
||||||
} ClutterTextureFlags;
|
} ClutterTextureFlags;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user