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

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

Browse Source 
* clutter/clutter-actor.c:
	* clutter/clutter-actor.h:
	* tests/test-cogl-primitives.c:
	* tests/test-events.c:
	* tests/test-multistage.c:
	* tests/test-textures.c:
	* tests/test-timeline.c: Miscellaneous fixes for distcheck to
	pass.
This commit is contained in:
Emmanuele Bassi 2008-06-13 15:01:34 +00:00
parent 76b71f8cc4
commit 4b97a02410
8 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.c:
* clutter/clutter-actor.h:
* tests/test-cogl-primitives.c:
* tests/test-events.c:
* tests/test-multistage.c:
* tests/test-textures.c:
* tests/test-timeline.c: Miscellaneous fixes for distcheck to
pass.
2008-06-13 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-13 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-texture.c: * clutter/clutter-texture.c:

32
clutter/clutter-actor.c
View File

@ -3257,10 +3257,10 @@ clutter_actor_get_preferred_height (ClutterActor *self,
/** /**
* clutter_actor_get_allocation_coords: * clutter_actor_get_allocation_coords:
* @self: A #ClutterActor * @self: A #ClutterActor
* @x1: x1 coord * @x_1: x1 coordinate
* @y1: y1 coord * @y_1: y1 coordinate
* @x2: x2 coord * @x_2: x2 coordinate
* @y2: y2 coord * @y_2: y2 coordinate
* *
* Gets the layout box an actor has been assigned. The allocation can * Gets the layout box an actor has been assigned. The allocation can
* only be assumed valid inside a paint() method; anywhere else, it * only be assumed valid inside a paint() method; anywhere else, it
@ -3275,10 +3275,10 @@ clutter_actor_get_preferred_height (ClutterActor *self,
*/ */
void void
clutter_actor_get_allocation_coords (ClutterActor *self, clutter_actor_get_allocation_coords (ClutterActor *self,
gint *x1, gint *x_1,
gint *y1, gint *y_1,
gint *x2, gint *x_2,
gint *y2) gint *y_2)
{ {
ClutterActorBox allocation = { 0, }; ClutterActorBox allocation = { 0, };
@ -3286,17 +3286,17 @@ clutter_actor_get_allocation_coords (ClutterActor *self,
clutter_actor_get_allocation_box (self, &allocation); clutter_actor_get_allocation_box (self, &allocation);
if (x1) if (x_1)
*x1 = CLUTTER_UNITS_TO_DEVICE (allocation.x1); *x_1 = CLUTTER_UNITS_TO_DEVICE (allocation.x1);
if (y1) if (y_1)
*y1 = CLUTTER_UNITS_TO_DEVICE (allocation.y1); *y_1 = CLUTTER_UNITS_TO_DEVICE (allocation.y1);
if (x2) if (x_2)
*x2 = CLUTTER_UNITS_TO_DEVICE (allocation.x2); *x_2 = CLUTTER_UNITS_TO_DEVICE (allocation.x2);
if (y2) if (y_2)
*y2 = CLUTTER_UNITS_TO_DEVICE (allocation.y2); *y_2 = CLUTTER_UNITS_TO_DEVICE (allocation.y2);
} }
/** /**

8
clutter/clutter-actor.h
View File

@ -302,10 +302,10 @@ void clutter_actor_allocate (ClutterActor
const ClutterActorBox *box, const ClutterActorBox *box,
gboolean absolute_origin_changed); gboolean absolute_origin_changed);
void clutter_actor_get_allocation_coords (ClutterActor *self, void clutter_actor_get_allocation_coords (ClutterActor *self,
gint *x1, gint *x_1,
gint *y1, gint *y_1,
gint *x2, gint *x_2,
gint *y2); gint *y_2);
void clutter_actor_get_allocation_box (ClutterActor *self, void clutter_actor_get_allocation_box (ClutterActor *self,
ClutterActorBox *box); ClutterActorBox *box);
void clutter_actor_get_allocation_geometry (ClutterActor *self, void clutter_actor_get_allocation_geometry (ClutterActor *self,

1
tests/test-cogl-primitives.c
View File

@ -194,6 +194,7 @@ test_coglbox_paint(ClutterActor *self)
{ {
timer = g_timer_new (); timer = g_timer_new ();
g_timer_start (timer); g_timer_start (timer);
paint_index = 0;
} }
if (g_timer_elapsed (timer, NULL) >= 1) if (g_timer_elapsed (timer, NULL) >= 1)

2
tests/test-events.c
View File

@ -184,7 +184,7 @@ input_cb (ClutterActor *actor,
if (clutter_event_get_source (event) == actor) if (clutter_event_get_source (event) == actor)
g_print (" *source*"); g_print (" *source*");
g_printf("\n"); g_print ("\n");
return FALSE; return FALSE;
} }

2
tests/test-multistage.c
View File

@ -8,6 +8,8 @@ tex_button_cb (ClutterActor *actor,
gpointer data) gpointer data)
{ {
clutter_actor_hide (actor); clutter_actor_hide (actor);
return TRUE;
} }
static gboolean static gboolean

2
tests/test-textures.c
View File

@ -11,7 +11,7 @@ make_rgba_data (int width, int height, int bpp, int has_alpha, int *rowstride_p)
{ {
#define CHECK_SIZE 20 #define CHECK_SIZE 20
gint x,y, rowstride, n_channels, i = 0; gint x,y, rowstride, i = 0;
guchar *pixels; guchar *pixels;
g_assert(bpp == 4); g_assert(bpp == 4);

7
tests/test-timeline.c
View File

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
static void static void
@ -59,7 +60,7 @@ timeline_3_marker_reached (ClutterTimeline *timeline,
const gchar *marker_name, const gchar *marker_name,
guint frame_num) guint frame_num)
{ {
g_print ("2: Marker `%s' (%d) reached\n", marker_name, frame_num); g_print ("3: Marker `%s' (%d) reached\n", marker_name, frame_num);
} }
int int
@ -105,7 +106,7 @@ main (int argc, char **argv)
NULL); NULL);
g_signal_connect (timeline_2, g_signal_connect (timeline_2,
"marker-reached::bar", G_CALLBACK (timeline_1_marker_reached), "marker-reached::bar", G_CALLBACK (timeline_2_marker_reached),
NULL); NULL);
g_signal_connect (timeline_2, g_signal_connect (timeline_2,
"new-frame", G_CALLBACK (timeline_2_new_frame_cb), "new-frame", G_CALLBACK (timeline_2_new_frame_cb),
@ -115,7 +116,7 @@ main (int argc, char **argv)
NULL); NULL);
g_signal_connect (timeline_3, g_signal_connect (timeline_3,
"marker-reached", G_CALLBACK (timeline_1_marker_reached), "marker-reached", G_CALLBACK (timeline_3_marker_reached),
NULL); NULL);
g_signal_connect (timeline_3, g_signal_connect (timeline_3,
"new-frame", G_CALLBACK (timeline_3_new_frame_cb), "new-frame", G_CALLBACK (timeline_3_new_frame_cb),