From 4a788a6df72477bd8c9891519a9245081b61b907 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 10 Jun 2008 17:11:14 +0000 Subject: [PATCH] 2008-06-10 Emmanuele Bassi * clutter/clutter-child-meta.c: Fix section name * clutter/clutter-container.c: (clutter_container_child_set_property), (clutter_container_child_get_property): Fix gtk-doc parameter name. * clutter/clutter-container.h: Fix documentation of the interface vfuncs. * clutter/clutter-event.h: Fix documentation. * clutter/clutter-feature.h: Fix documentation. * clutter/clutter-types.h: Add ClutterRequestMode. * clutter/x11/clutter-event-x11.c: Fix documentation. * tests/test-fullscreen.c: Verify that the stage size has been changed by clutter_stage_fullscreen(). --- ChangeLog | 23 +++++++++++++++++++++++ clutter/clutter-child-meta.c | 2 +- clutter/clutter-container.c | 16 ++++++++-------- clutter/clutter-container.h | 23 ++++++++++++----------- clutter/clutter-event.h | 2 +- clutter/clutter-feature.h | 2 +- clutter/clutter-types.h | 14 ++++++++++++++ clutter/x11/clutter-event-x11.c | 6 +++--- tests/test-fullscreen.c | 5 +++++ 9 files changed, 68 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1e8d3b06..b4be9fc0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2008-06-10 Emmanuele Bassi + + * clutter/clutter-child-meta.c: Fix section name + + * clutter/clutter-container.c: + (clutter_container_child_set_property), + (clutter_container_child_get_property): Fix gtk-doc parameter + name. + + * clutter/clutter-container.h: Fix documentation of the + interface vfuncs. + + * clutter/clutter-event.h: Fix documentation. + + * clutter/clutter-feature.h: Fix documentation. + + * clutter/clutter-types.h: Add ClutterRequestMode. + + * clutter/x11/clutter-event-x11.c: Fix documentation. + + * tests/test-fullscreen.c: Verify that the stage size has been + changed by clutter_stage_fullscreen(). + 2008-06-10 Emmanuele Bassi Bug #815 - Split up request, allocation, and paint box diff --git a/clutter/clutter-child-meta.c b/clutter/clutter-child-meta.c index 77058359b..ea97288ef 100644 --- a/clutter/clutter-child-meta.c +++ b/clutter/clutter-child-meta.c @@ -28,7 +28,7 @@ */ /** - * SECTION:clutter-child-data + * SECTION:clutter-child-meta * @short_description: Wrapper for actors inside a container * * #ClutterChildMeta is a wrapper object created by #ClutterContainer diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c index fd378435e..80918a3f4 100644 --- a/clutter/clutter-container.c +++ b/clutter/clutter-container.c @@ -856,7 +856,7 @@ container_set_child_property (ClutterContainer *container, /** * clutter_container_child_set_property: * @container: a #ClutterContainer - * @actor: a #ClutterActor that is a child of @container. + * @child: a #ClutterActor that is a child of @container. * @property: the name of the property to set. * @value: the value. * @@ -866,7 +866,7 @@ container_set_child_property (ClutterContainer *container, */ void clutter_container_child_set_property (ClutterContainer *container, - ClutterActor *actor, + ClutterActor *child, const gchar *property, const GValue *value) { @@ -874,7 +874,7 @@ clutter_container_child_set_property (ClutterContainer *container, GParamSpec *pspec; g_return_if_fail (CLUTTER_IS_CONTAINER (container)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); + g_return_if_fail (CLUTTER_IS_ACTOR (child)); g_return_if_fail (property != NULL); g_return_if_fail (value != NULL); @@ -897,7 +897,7 @@ clutter_container_child_set_property (ClutterContainer *container, return; } - container_set_child_property (container, actor, value, pspec); + container_set_child_property (container, child, value, pspec); } /** @@ -991,7 +991,7 @@ container_get_child_property (ClutterContainer *container, /** * clutter_container_child_get_property: * @container: a #ClutterContainer - * @actor: a #ClutterActor that is a child of @container. + * @child: a #ClutterActor that is a child of @container. * @property: the name of the property to set. * @value: the value. * @@ -1007,7 +1007,7 @@ container_get_child_property (ClutterContainer *container, */ void clutter_container_child_get_property (ClutterContainer *container, - ClutterActor *actor, + ClutterActor *child, const gchar *property, GValue *value) { @@ -1015,7 +1015,7 @@ clutter_container_child_get_property (ClutterContainer *container, GParamSpec *pspec; g_return_if_fail (CLUTTER_IS_CONTAINER (container)); - g_return_if_fail (CLUTTER_IS_ACTOR (actor)); + g_return_if_fail (CLUTTER_IS_ACTOR (child)); g_return_if_fail (property != NULL); g_return_if_fail (value != NULL); @@ -1038,7 +1038,7 @@ clutter_container_child_get_property (ClutterContainer *container, return; } - container_get_child_property (container, actor, value, pspec); + container_get_child_property (container, child, value, pspec); } diff --git a/clutter/clutter-container.h b/clutter/clutter-container.h index 62342daf7..765e705cd 100644 --- a/clutter/clutter-container.h +++ b/clutter/clutter-container.h @@ -51,17 +51,18 @@ typedef struct _ClutterContainerIface ClutterContainerIface; * @lower: virtual function for lowering a child * @sort_depth_order: virtual function for sorting the children of a * container depending on their depth - * @child_record_type: The GType used for storing auxiliary information about - * each of the containers children. - * @create_child_record: virtual function that gets called for each added - * child, the function should instantiate @child_record_type, set the container - * and actor fields in the instance and add the record to a data structure for - * subsequent access for get_child_record. - * @destroy_child_record: virtual function that gets called when a child is removed - * it shuld release all resources held by the record. - * @get_child_record: return the record for a container child. - * @actor_added: signal class handler for ClutterContainer::actor_added - * @actor_removed: signal class handler for ClutterContainer::actor_removed + * @child_meta_type: The GType used for storing auxiliary information about + * each of the containers children. + * @create_child_meta: virtual function that gets called for each added + * child, the function should instantiate an object of type + * #ClutterContainerIface::child_meta_type, set the container and actor + * fields in the instance and add the record to a data structure for + * subsequent access for #ClutterContainerIface::get_child_meta + * @destroy_child_meta: virtual function that gets called when a child is + * removed; it shuld release all resources held by the record + * @get_child_meta: return the record for a container child + * @actor_added: signal class handler for #ClutterContainer::actor_added + * @actor_removed: signal class handler for #ClutterContainer::actor_removed * * Base interface for container actors. * diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h index 056cf0cf7..9cbdcb4b7 100644 --- a/clutter/clutter-event.h +++ b/clutter/clutter-event.h @@ -189,7 +189,6 @@ typedef struct _ClutterInputDevice ClutterInputDevice; * @type: event type * @time: event time * @flags: event flags - * @stage: event source stage * @source: event source actor * * Common members for a #ClutterEvent @@ -239,6 +238,7 @@ struct _ClutterKeyEvent * @type: event type * @time: event time * @flags: event flags + * @stage: event source stage * @source: event source actor * @x: event X coordinate * @y: event Y coordinate diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h index 9624c2a24..89be737ea 100644 --- a/clutter/clutter-feature.h +++ b/clutter/clutter-feature.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS /** * ClutterFeatureFlags: - * @CLUTTER_FEATURE_TEXTURE_RECTANGLE: Set if NPOTS textures supported. + * @CLUTTER_FEATURE_TEXTURE_NPOT: Set if NPOTS textures supported. * @CLUTTER_FEATURE_SYNC_TO_VBLANK: Set if vblank syncing supported. * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported. * @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read. diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h index a15c87119..57471ee46 100644 --- a/clutter/clutter-types.h +++ b/clutter/clutter-types.h @@ -170,6 +170,20 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/ CLUTTER_ROTATE_CCW } ClutterRotateDirection; +/** + * ClutterRequestMode: + * @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests + * @CLUTTER_REQUEST_WIDTH_FOR_HEIGHT: Width for height requests + * + * Specifies the type of requests for a #ClutterActor. + * + * Since: 0.8 + */ +typedef enum { + CLUTTER_REQUEST_HEIGHT_FOR_WIDTH, + CLUTTER_REQUEST_WIDTH_FOR_HEIGHT +} ClutterRequestMode; + G_END_DECLS #endif /* __CLUTTER_TYPES_H__ */ diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index eaaf6fb6f..0a7031803 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -662,14 +662,14 @@ events_queue (ClutterBackend *backend) } /** - * clutter_x11_handle_event + * clutter_x11_handle_event: * @xevent: pointer to XEvent structure * * This function processes a single X event; it can be used to hook * into external X event retrieval (for example that done by GDK). * - * Return: #ClutterX11FilterReturn indicating what the caller should - * do with the original event. + * Return value: #ClutterX11FilterReturn indicating what the caller + * should do with the original event. * * Since: 0.8 */ diff --git a/tests/test-fullscreen.c b/tests/test-fullscreen.c index a6f6a0488..35406e8a1 100644 --- a/tests/test-fullscreen.c +++ b/tests/test-fullscreen.c @@ -84,6 +84,11 @@ main (int argc, char *argv[]) clutter_stage_fullscreen (CLUTTER_STAGE (stage)); clutter_actor_show (stage); + g_debug ("stage size: %dx%d, mapped: %s", + clutter_actor_get_width (stage), + clutter_actor_get_height (stage), + CLUTTER_ACTOR_IS_MAPPED (stage) ? "true" : "false"); + g_timeout_add (1000, toggle_fullscreen, NULL); clutter_main ();