isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-12-09 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* tests/test-events.c (input_cb):
	* tests/test-text.c (main): Fix compiler errors. (#592,
	Gwenole Beauchesne)
This commit is contained in:
Emmanuele Bassi 2007-12-09 08:53:06 +00:00
parent bd355346de
commit e1b1bc289c
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-12-09 Emmanuele Bassi <ebassi@openedhand.com>
* tests/test-events.c (input_cb):
* tests/test-text.c (main): Fix compiler errors. (#592,
Gwenole Beauchesne)
2007-12-09 Emmanuele Bassi <ebassi@openedhand.com> 2007-12-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.c: Document the values for full * clutter/clutter-actor.c: Document the values for full

2
tests/test-events.c
View File

@ -142,7 +142,7 @@ input_cb (ClutterActor *actor,
printf("[%s] DELETE", source); printf("[%s] DELETE", source);
break; break;
case CLUTTER_NOTHING: case CLUTTER_NOTHING:
return; return FALSE;
} }
if (clutter_event_get_source (event) == actor) if (clutter_event_get_source (event) == actor)

19
tests/test-text.c
View File

@ -1,5 +1,8 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <stdlib.h>
#include <string.h>
#define STAGE_WIDTH 640 #define STAGE_WIDTH 640
#define STAGE_HEIGHT 480 #define STAGE_HEIGHT 480
@ -10,8 +13,6 @@ int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
ClutterActor *stage; ClutterActor *stage;
gchar *text;
gsize size;
ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff }; ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
ClutterColor label_color = { 0xff, 0xff, 0xff, 0xff }; ClutterColor label_color = { 0xff, 0xff, 0xff, 0xff };
@ -22,18 +23,16 @@ main (int argc, char *argv[])
clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
{ {
gint font_size; gint row, col;
gdouble scale;
gint row, col;
for (row=0; row<ROWS; row++) for (row=0; row<ROWS; row++)
for (col=0; col<COLS; col++) for (col=0; col<COLS; col++)
{ {
ClutterActor *label; ClutterActor *label;
gchar font_name[64]; gchar font_name[64];
gchar text[64]; gchar text[64];
gint font_size = row+10; gint font_size = row+10;
gdouble scale = 0.17 + (1.5*col/COLS); gdouble scale = 0.17 + (1.5 * col / COLS);
sprintf (font_name, "Sans %ipx", font_size); sprintf (font_name, "Sans %ipx", font_size);
sprintf (text, "OH"); sprintf (text, "OH");
@ -49,8 +48,8 @@ main (int argc, char *argv[])
{ {
sprintf (font_name, "Sans 10px"); sprintf (font_name, "Sans 10px");
sprintf (text, "%ipx", font_size); sprintf (text, "%ipx", font_size);
if (row==0) if (row == 0)
sprintf (text, ""); strcpy (text, "");
font_size = 10; font_size = 10;
scale = 1.0; scale = 1.0;
} }