brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-07-28 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* 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:
Emmanuele Bassi 2007-07-28 17:11:39 +00:00
parent 29859bb8ca
commit ad64200aa7
7 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -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>
* clutter/clutter-behaviour-ellipse.h:

24
clutter/clutter-actor.c
View File

@ -1431,12 +1431,16 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
{
ClutterVertex v1;
ClutterVertex v2;
g_return_if_fail (CLUTTER_IS_ACTOR (self));
v1.x = v1.y = v1.z = 0;
clutter_actor_apply_transform_to_point (self, &v1, &v2);
*x = v2.x;
*y = v2.y;
if (x)
*x = v2.x;
if (y)
*y = v2.y;
}
/**
@ -1450,14 +1454,20 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
*/
void
clutter_actor_get_abs_position (ClutterActor *self,
gint *x,
gint *y)
gint *x,
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);
*x = CLUTTER_UNITS_TO_INT (xu);
*y = CLUTTER_UNITS_TO_INT (yu);
if (x)
*x = CLUTTER_UNITS_TO_INT (xu);
if (y)
*y = CLUTTER_UNITS_TO_INT (yu);
}
/*

4
clutter/clutter-actor.h
View File

@ -111,7 +111,7 @@ GType clutter_actor_box_get_type (void) G_GNUC_CONST;
struct _ClutterActor
{
/*< private >*/
GObject parent_instance;
GInitiallyUnowned parent_instance;
/*< public >*/
guint32 flags;
@ -124,7 +124,7 @@ struct _ClutterActor
struct _ClutterActorClass
{
GObjectClass parent_class;
GInitiallyUnownedClass parent_class;
void (* show) (ClutterActor *actor);
void (* show_all) (ClutterActor *actor);

2
clutter/clutter-behaviour-ellipse.c
View File

@ -992,7 +992,7 @@ clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
/**
* clutter_behaviour_ellipse_get_angle_tiltx
* @self: a #ClutterBehaviourEllipse
* @self: a #ClutterRotateAxis
* @axis: a #ClutterRotateAxis
*
* Gets the tilt of the ellipse around the center in the given axis.
*

8
clutter/clutter-behaviour-ellipse.h
View File

@ -135,18 +135,18 @@ ClutterAngle clutter_behaviour_ellipse_get_angle_endx (ClutterBeha
gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self);
void clutter_behaviour_ellipse_set_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis,
ClutterRotateAxis axis,
ClutterAngle angle_tilt);
void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis,
ClutterRotateAxis axis,
gdouble angle_tilt);
ClutterAngle clutter_behaviour_ellipse_get_angle_tiltx (ClutterBehaviourEllipse *self,
ClutterRotateAxis);
ClutterRotateAxis axis);
gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self,
ClutterRotateAxis);
ClutterRotateAxis axis);
void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self,
gdouble angle_tilt_x,

2
clutter/clutter-effect.c
View File

@ -657,7 +657,7 @@ clutter_effect_rotate_y (ClutterEffectTemplate *template_,
}
/**
* clutter_effect_rotate_y:
* clutter_effect_rotate_z:
* @template_: A #ClutterEffectTemplate
* @actor: A #ClutterActor to apply the effect to.
* @angle_begin: Initial angle to apply to actor

10
clutter/clutter-texture.h
View File

@ -75,11 +75,11 @@ struct _ClutterTextureClass
void (*_clutter_texture6) (void);
};
typedef enum ClutterTextureFlags
{
CLUTTER_TEXTURE_RGB_FLAG_BGR = (1 << 1),
CLUTTER_TEXTURE_RGB_FLAG_PREMULT = (1 << 2), /* FIXME: not handled */
CLUTTER_TEXTURE_YUV_FLAG_YUV2 = (1 << 3)
typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
CLUTTER_TEXTURE_RGB_FLAG_BGR = 1 << 1,
CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */
CLUTTER_TEXTURE_YUV_FLAG_YUV2 = 1 << 3
/* FIXME: add compressed types ? */
} ClutterTextureFlags;