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

2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* tests/test-script.c:
	* tests/test-script.json: Test merging the same actor from two
	different sources.
This commit is contained in:
Emmanuele Bassi 2008-05-28 12:20:54 +00:00
parent 1b9ce112c4
commit 28430b7c1b
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>
* tests/test-script.c:
* tests/test-script.json: Test merging the same actor from two
different sources.
2008-05-28 Emmanuele Bassi <ebassi@openedhand.com> 2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>
Fix merging of objects with the same id. Fix merging of objects with the same id.

9
tests/test-script.c
View File

@ -9,6 +9,12 @@ static ClutterScript *script = NULL;
static guint merge_id = 0; static guint merge_id = 0;
static const gchar *test_unmerge = static const gchar *test_unmerge =
"["
" {"
" \"id\" : \"main-stage\","
" \"type\" : \"ClutterStage\","
" \"children\" : [ \"blue-button\" ]"
" },"
" {" " {"
" \"id\" : \"blue-button\"," " \"id\" : \"blue-button\","
" \"type\" : \"ClutterRectangle\"," " \"type\" : \"ClutterRectangle\","
@ -19,7 +25,8 @@ static const gchar *test_unmerge =
" \"height\" : 100," " \"height\" : 100,"
" \"visible\" : true," " \"visible\" : true,"
" \"reactive\" : true" " \"reactive\" : true"
"}"; " }"
"]";
static const gchar *test_behaviour = static const gchar *test_behaviour =
"[" "["

3
tests/test-script.json
View File

@ -72,8 +72,7 @@
{ "y-axis" : [ 60.0, [ 275, 100 ] ] }, { "y-axis" : [ 60.0, [ 275, 100 ] ] },
{ "z-axis" : [ 45.0, [ 75, 75 ] ] } { "z-axis" : [ 45.0, [ 75, 75 ] ] }
] ]
}, }
"blue-button",
] ]
} }
} }