isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop ClutterBox

Browse Source 
Nobody was subclassing or using it, except for the tests. Replace
it by ClutterActor in the tests.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332
This commit is contained in:
Georges Basile Stavracas Neto
2020-06-26 17:15:04 -03:00
committed by Robert Mader
parent d54b10b366
commit 2802d359e5
8 changed files with 8 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/clutter/conform/script-parser.c
View File

@ -215,9 +215,9 @@ script_object_property (void)
g_assert_no_error (error);
actor = clutter_script_get_object (script, "test");
g_assert (CLUTTER_IS_BOX (actor));
g_assert (CLUTTER_IS_ACTOR (actor));
manager = clutter_box_get_layout_manager (CLUTTER_BOX (actor));
manager = clutter_actor_get_layout_manager (CLUTTER_ACTOR (actor));
g_assert (CLUTTER_IS_BIN_LAYOUT (manager));
g_object_unref (script);
@ -241,9 +241,9 @@ script_named_object (void)
g_assert_no_error (error);
actor = clutter_script_get_object (script, "test");
g_assert (CLUTTER_IS_BOX (actor));
g_assert (CLUTTER_IS_ACTOR (actor));
manager = clutter_box_get_layout_manager (CLUTTER_BOX (actor));
manager = clutter_actor_get_layout_manager (CLUTTER_ACTOR (actor));
g_assert (CLUTTER_IS_BOX_LAYOUT (manager));
g_assert (clutter_box_layout_get_orientation (CLUTTER_BOX_LAYOUT (manager)) == CLUTTER_ORIENTATION_VERTICAL);

2
src/tests/clutter/conform/scripts/test-script-named-object.json
View File

@ -12,7 +12,7 @@
"children" : [
{
"id" : "test",
"type" : "ClutterBox",
"type" : "ClutterActor",
"layout-manager" : "layout",
"children" : [
{

2
src/tests/clutter/conform/scripts/test-script-object-property.json
View File

@ -1,6 +1,6 @@
{
"id" : "test",
"type" : "ClutterBox",
"type" : "ClutterActor",
"layout-manager" : { "id" : "layout", "type" : "ClutterBinLayout" },
"children" : [
{