clutter: Drop ClutterGroup

It is now unused.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332
This commit is contained in:
Georges Basile Stavracas Neto
2020-06-26 16:26:49 -03:00
committed by Robert Mader
parent 8d83dec044
commit ce3e293a18
25 changed files with 14 additions and 1010 deletions

View File

@ -72,7 +72,7 @@ main (int argc, char *argv[])
clutter_actor_set_size (button4, SIZE, SIZE);
for (i = 0; i < 4; i++) {
group[i] = clutter_group_new ();
group[i] = clutter_actor_new ();
clutter_actor_set_position (group[i], SIZE / 2, SIZE / 2);
clutter_actor_set_size (group[i], SIZE, SIZE);

View File

@ -149,7 +149,7 @@ _create_button (const gchar *text)
ClutterActor *rectangle = NULL;
ClutterActor *label = NULL;
button = clutter_group_new ();
button = clutter_actor_new ();
rectangle = clutter_rectangle_new_with_color (CLUTTER_COLOR_Magenta);
clutter_actor_set_size (rectangle, 375, 35);

View File

@ -209,7 +209,7 @@ make_ui (ClutterActor *stage)
clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_editable_actor);
/* test button */
button = clutter_group_new ();
button = clutter_actor_new ();
rectangle = clutter_rectangle_new_with_color (&color_rect);
clutter_actor_set_size (rectangle, 75, 35);

View File

@ -70,7 +70,7 @@ make_ui (ClutterActor *stage)
clutter_actor_set_position (rectangle, 150, 50);
clutter_actor_add_constraint (rectangle, clutter_bind_constraint_new (editable, CLUTTER_BIND_SIZE, 0));
full_entry = clutter_group_new ();
full_entry = clutter_actor_new ();
clutter_actor_set_position (full_entry, 0, 50);
clutter_actor_set_size (full_entry, 100, 75);
clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), label);

View File

@ -84,7 +84,7 @@ opacity_paint (void)
stage = clutter_test_get_stage ();
group1 = clutter_group_new ();
group1 = clutter_actor_new ();
clutter_actor_set_opacity (group1, 128);
clutter_container_add (CLUTTER_CONTAINER (stage), group1, NULL);
clutter_actor_set_position (group1, 10, 30);
@ -111,7 +111,7 @@ opacity_paint (void)
clutter_actor_destroy (label);
group2 = clutter_group_new ();
group2 = clutter_actor_new ();
clutter_container_add (CLUTTER_CONTAINER (group1), group2, NULL);
clutter_actor_set_position (group2, 10, 60);

View File

@ -1,62 +0,0 @@
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include <clutter/clutter.h>
#include "tests/clutter-test-utils.h"
static void
group_depth_sorting (void)
{
ClutterActor *group;
ClutterActor *child, *test;
ClutterGroup *g;
GList *children;
group = clutter_group_new ();
g = CLUTTER_GROUP (group);
child = clutter_rectangle_new ();
clutter_actor_set_size (child, 20, 20);
clutter_actor_set_z_position (child, 0);
clutter_actor_set_name (child, "zero");
clutter_container_add_actor (CLUTTER_CONTAINER (group), child);
children = clutter_container_get_children (CLUTTER_CONTAINER (group));
g_assert (children->data == child);
g_assert (children->next == NULL);
g_list_free (children);
child = clutter_rectangle_new ();
clutter_actor_set_size (child, 20, 20);
clutter_actor_set_z_position (child, 10);
clutter_actor_set_name (child, "plus-ten");
clutter_container_add_actor (CLUTTER_CONTAINER (group), child);
test = clutter_group_get_nth_child (g, 0);
g_assert_cmpstr (clutter_actor_get_name (test), ==, "zero");
test = clutter_group_get_nth_child (g, 1);
g_assert_cmpstr (clutter_actor_get_name (test), ==, "plus-ten");
child = clutter_rectangle_new ();
clutter_actor_set_size (child, 20, 20);
clutter_actor_set_z_position (child, -10);
clutter_actor_set_name (child, "minus-ten");
clutter_container_add_actor (CLUTTER_CONTAINER (group), child);
g_assert_cmpint (clutter_group_get_n_children (g), ==, 3);
test = clutter_group_get_nth_child (g, 0);
g_assert_cmpstr (clutter_actor_get_name (test), ==, "minus-ten");
test = clutter_group_get_nth_child (g, 1);
g_assert_cmpstr (clutter_actor_get_name (test), ==, "zero");
test = clutter_group_get_nth_child (g, 2);
g_assert_cmpstr (clutter_actor_get_name (test), ==, "plus-ten");
clutter_actor_destroy (group);
}
CLUTTER_TEST_SUITE (
CLUTTER_TEST_UNIT ("/group/depth-sorting", group_depth_sorting)
)

View File

@ -41,7 +41,6 @@ clutter_conform_tests_general_tests = [
]
clutter_conform_tests_deprecated_tests = [
'group',
'rectangle',
]

View File

@ -31,7 +31,7 @@ static ClutterActor *
create_source (void)
{
int x, y;
ClutterActor *group = clutter_group_new ();
ClutterActor *group = clutter_actor_new ();
/* Create a group with a different coloured rectangle at each
corner */

View File

@ -138,7 +138,7 @@ test_cogl_multitexture_main (int argc, char *argv[])
* default paint handler, so that we can easily control
* painting in a paint signal handler, without having to
* sub-class anything etc. */
state->group = clutter_group_new ();
state->group = clutter_actor_new ();
clutter_actor_set_position (state->group, stage_w / 2, stage_h / 2);
g_signal_connect (state->group, "paint",
G_CALLBACK(material_rectangle_paint), state);

View File

@ -366,7 +366,7 @@ on_toggle_click (ClutterActor *button, ClutterEvent *event,
static ClutterActor *
make_toggle (const char *label_text, gboolean *toggle_val)
{
ClutterActor *group = clutter_group_new ();
ClutterActor *group = clutter_actor_new ();
ClutterActor *label = clutter_text_new_with_text ("Sans 14", label_text);
ClutterActor *button = clutter_text_new_with_text ("Sans 14", "");

View File

@ -463,7 +463,7 @@ test_events_main (int argc, char *argv[])
g_signal_connect (actor, "event", G_CALLBACK (input_cb), (char *) "yellow box");
/* note group not reactive */
group = clutter_group_new ();
group = clutter_actor_new ();
clutter_container_add (CLUTTER_CONTAINER (group), actor, NULL);
clutter_container_add (CLUTTER_CONTAINER (stage), group, NULL);
clutter_actor_set_position (group, 100, 350);

View File

@ -263,7 +263,7 @@ test_paint_wrapper_main (int argc, char *argv[])
}
/* create a new group to hold multiple actors in a group */
oh->group = clutter_group_new();
oh->group = clutter_actor_new();
oh->hand = g_new (ClutterActor*, n_hands);

View File

@ -58,7 +58,7 @@ main (int argc, char *argv[])
clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black);
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text");
group = clutter_group_new ();
group = clutter_actor_new ();
clutter_actor_set_size (group, STAGE_WIDTH, STAGE_WIDTH);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);