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>
+
Fix merging of objects with the same id.
* clutter/clutter-script.c:
static guint merge_id = 0;
static const gchar *test_unmerge =
-"{"
-" \"id\" : \"blue-button\","
-" \"type\" : \"ClutterRectangle\","
-" \"color\" : \"#0000ffff\","
-" \"x\" : 350,"
-" \"y\" : 50,"
-" \"width\" : 100,"
-" \"height\" : 100,"
-" \"visible\" : true,"
-" \"reactive\" : true"
-"}";
+"["
+" {"
+" \"id\" : \"main-stage\","
+" \"type\" : \"ClutterStage\","
+" \"children\" : [ \"blue-button\" ]"
+" },"
+" {"
+" \"id\" : \"blue-button\","
+" \"type\" : \"ClutterRectangle\","
+" \"color\" : \"#0000ffff\","
+" \"x\" : 350,"
+" \"y\" : 50,"
+" \"width\" : 100,"
+" \"height\" : 100,"
+" \"visible\" : true,"
+" \"reactive\" : true"
+" }"
+"]";
static const gchar *test_behaviour =
"["
{ "y-axis" : [ 60.0, [ 275, 100 ] ] },
{ "z-axis" : [ 45.0, [ 75, 75 ] ] }
]
- },
- "blue-button",
+ }
]
}
}