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

2008-06-10 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* 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().
This commit is contained in:
Emmanuele Bassi 2008-06-10 17:11:14 +00:00
parent 473d0e9fc3
commit 4a788a6df7
9 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2008-06-10 Emmanuele Bassi <ebassi@openedhand.com>
* 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 <ebassi@openedhand.com> 2008-06-10 Emmanuele Bassi <ebassi@openedhand.com>
Bug #815 - Split up request, allocation, and paint box Bug #815 - Split up request, allocation, and paint box

2
clutter/clutter-child-meta.c
View File

@ -28,7 +28,7 @@
*/ */
/** /**
* SECTION:clutter-child-data * SECTION:clutter-child-meta
* @short_description: Wrapper for actors inside a container * @short_description: Wrapper for actors inside a container
* *
* #ClutterChildMeta is a wrapper object created by #ClutterContainer * #ClutterChildMeta is a wrapper object created by #ClutterContainer

16
clutter/clutter-container.c
View File

@ -856,7 +856,7 @@ container_set_child_property (ClutterContainer *container,
/** /**
* clutter_container_child_set_property: * clutter_container_child_set_property:
* @container: a #ClutterContainer * @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. * @property: the name of the property to set.
* @value: the value. * @value: the value.
* *
@ -866,7 +866,7 @@ container_set_child_property (ClutterContainer *container,
*/ */
void void
clutter_container_child_set_property (ClutterContainer *container, clutter_container_child_set_property (ClutterContainer *container,
ClutterActor *actor, ClutterActor *child,
const gchar *property, const gchar *property,
const GValue *value) const GValue *value)
{ {
@ -874,7 +874,7 @@ clutter_container_child_set_property (ClutterContainer *container,
GParamSpec *pspec; GParamSpec *pspec;
g_return_if_fail (CLUTTER_IS_CONTAINER (container)); 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 (property != NULL);
g_return_if_fail (value != NULL); g_return_if_fail (value != NULL);
@ -897,7 +897,7 @@ clutter_container_child_set_property (ClutterContainer *container,
return; 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: * clutter_container_child_get_property:
* @container: a #ClutterContainer * @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. * @property: the name of the property to set.
* @value: the value. * @value: the value.
* *
@ -1007,7 +1007,7 @@ container_get_child_property (ClutterContainer *container,
*/ */
void void
clutter_container_child_get_property (ClutterContainer *container, clutter_container_child_get_property (ClutterContainer *container,
ClutterActor *actor, ClutterActor *child,
const gchar *property, const gchar *property,
GValue *value) GValue *value)
{ {
@ -1015,7 +1015,7 @@ clutter_container_child_get_property (ClutterContainer *container,
GParamSpec *pspec; GParamSpec *pspec;
g_return_if_fail (CLUTTER_IS_CONTAINER (container)); 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 (property != NULL);
g_return_if_fail (value != NULL); g_return_if_fail (value != NULL);
@ -1038,7 +1038,7 @@ clutter_container_child_get_property (ClutterContainer *container,
return; return;
} }
container_get_child_property (container, actor, value, pspec); container_get_child_property (container, child, value, pspec);
} }

21
clutter/clutter-container.h
View File

@ -51,17 +51,18 @@ typedef struct _ClutterContainerIface ClutterContainerIface;
* @lower: virtual function for lowering a child * @lower: virtual function for lowering a child
* @sort_depth_order: virtual function for sorting the children of a * @sort_depth_order: virtual function for sorting the children of a
* container depending on their depth * container depending on their depth
* @child_record_type: The GType used for storing auxiliary information about * @child_meta_type: The GType used for storing auxiliary information about
* each of the containers children. * each of the containers children.
* @create_child_record: virtual function that gets called for each added * @create_child_meta: virtual function that gets called for each added
* child, the function should instantiate @child_record_type, set the container * child, the function should instantiate an object of type
* and actor fields in the instance and add the record to a data structure for * #ClutterContainerIface::child_meta_type, set the container and actor
* subsequent access for get_child_record. * fields in the instance and add the record to a data structure for
* @destroy_child_record: virtual function that gets called when a child is removed * subsequent access for #ClutterContainerIface::get_child_meta
* it shuld release all resources held by the record. * @destroy_child_meta: virtual function that gets called when a child is
* @get_child_record: return the record for a container child. * removed; it shuld release all resources held by the record
* @actor_added: signal class handler for ClutterContainer::actor_added * @get_child_meta: return the record for a container child
* @actor_removed: signal class handler for ClutterContainer::actor_removed * @actor_added: signal class handler for #ClutterContainer::actor_added
* @actor_removed: signal class handler for #ClutterContainer::actor_removed
* *
* Base interface for container actors. * Base interface for container actors.
* *

2
clutter/clutter-event.h
View File

@ -189,7 +189,6 @@ typedef struct _ClutterInputDevice ClutterInputDevice;
* @type: event type * @type: event type
* @time: event time * @time: event time
* @flags: event flags * @flags: event flags
* @stage: event source stage
* @source: event source actor * @source: event source actor
* *
* Common members for a #ClutterEvent * Common members for a #ClutterEvent
@ -239,6 +238,7 @@ struct _ClutterKeyEvent
* @type: event type * @type: event type
* @time: event time * @time: event time
* @flags: event flags * @flags: event flags
* @stage: event source stage
* @source: event source actor * @source: event source actor
* @x: event X coordinate * @x: event X coordinate
* @y: event Y coordinate * @y: event Y coordinate

2
clutter/clutter-feature.h
View File

@ -39,7 +39,7 @@ G_BEGIN_DECLS
/** /**
* ClutterFeatureFlags: * 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_SYNC_TO_VBLANK: Set if vblank syncing supported.
* @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported. * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported.
* @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read. * @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read.

14
clutter/clutter-types.h
View File

@ -170,6 +170,20 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
CLUTTER_ROTATE_CCW CLUTTER_ROTATE_CCW
} ClutterRotateDirection; } 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 G_END_DECLS
#endif /* __CLUTTER_TYPES_H__ */ #endif /* __CLUTTER_TYPES_H__ */

6
clutter/x11/clutter-event-x11.c
View File

@ -662,14 +662,14 @@ events_queue (ClutterBackend *backend)
} }
/** /**
* clutter_x11_handle_event * clutter_x11_handle_event:
* @xevent: pointer to XEvent structure * @xevent: pointer to XEvent structure
* *
* This function processes a single X event; it can be used to hook * This function processes a single X event; it can be used to hook
* into external X event retrieval (for example that done by GDK). * into external X event retrieval (for example that done by GDK).
* *
* Return: #ClutterX11FilterReturn indicating what the caller should * Return value: #ClutterX11FilterReturn indicating what the caller
* do with the original event. * should do with the original event.
* *
* Since: 0.8 * Since: 0.8
*/ */

5
tests/test-fullscreen.c
View File

@ -84,6 +84,11 @@ main (int argc, char *argv[])
clutter_stage_fullscreen (CLUTTER_STAGE (stage)); clutter_stage_fullscreen (CLUTTER_STAGE (stage));
clutter_actor_show (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); g_timeout_add (1000, toggle_fullscreen, NULL);
clutter_main (); clutter_main ();