mirror of
https://github.com/brl/mutter.git
synced 2024-11-24 17:10:40 -05:00
clutter/actor: Remove clutter_actor_show_all
Actors are visible by default these days, and this function is deprecated for a long time. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332
This commit is contained in:
parent
237f277641
commit
d4953c77c3
@ -1973,28 +1973,6 @@ clutter_actor_is_visible (ClutterActor *self)
|
||||
return CLUTTER_ACTOR_IS_VISIBLE (self);
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_actor_show_all:
|
||||
* @self: a #ClutterActor
|
||||
*
|
||||
* Calls clutter_actor_show() on all children of an actor (if any).
|
||||
*
|
||||
* Since: 0.2
|
||||
*
|
||||
* Deprecated: 1.10: Actors are visible by default
|
||||
*/
|
||||
void
|
||||
clutter_actor_show_all (ClutterActor *self)
|
||||
{
|
||||
ClutterActorClass *klass;
|
||||
|
||||
g_return_if_fail (CLUTTER_IS_ACTOR (self));
|
||||
|
||||
klass = CLUTTER_ACTOR_GET_CLASS (self);
|
||||
if (klass->show_all)
|
||||
klass->show_all (self);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_actor_real_hide (ClutterActor *self)
|
||||
{
|
||||
@ -6436,7 +6414,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
|
||||
object_class->finalize = clutter_actor_finalize;
|
||||
|
||||
klass->show = clutter_actor_real_show;
|
||||
klass->show_all = clutter_actor_show;
|
||||
klass->hide = clutter_actor_real_hide;
|
||||
klass->hide_all = clutter_actor_hide;
|
||||
klass->map = clutter_actor_real_map;
|
||||
|
@ -142,11 +142,6 @@ struct _ClutterActor
|
||||
* ClutterActorClass:
|
||||
* @show: signal class handler for #ClutterActor::show; it must chain
|
||||
* up to the parent's implementation
|
||||
* @show_all: virtual function for containers and composite actors, to
|
||||
* determine which children should be shown when calling
|
||||
* clutter_actor_show_all() on the actor. Defaults to calling
|
||||
* clutter_actor_show(). This virtual function is deprecated and it
|
||||
* should not be overridden.
|
||||
* @hide: signal class handler for #ClutterActor::hide; it must chain
|
||||
* up to the parent's implementation
|
||||
* @hide_all: virtual function for containers and composite actors, to
|
||||
@ -226,7 +221,6 @@ struct _ClutterActorClass
|
||||
|
||||
/*< public >*/
|
||||
void (* show) (ClutterActor *self);
|
||||
void (* show_all) (ClutterActor *self);
|
||||
void (* hide) (ClutterActor *self);
|
||||
void (* hide_all) (ClutterActor *self);
|
||||
void (* realize) (ClutterActor *self);
|
||||
|
@ -1017,22 +1017,6 @@ clutter_stage_unrealize (ClutterActor *self)
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_stage_show_all (ClutterActor *self)
|
||||
{
|
||||
ClutterActorIter iter;
|
||||
ClutterActor *child;
|
||||
|
||||
/* we don't do a recursive show_all(), to maintain the old
|
||||
* invariants from ClutterGroup
|
||||
*/
|
||||
clutter_actor_iter_init (&iter, self);
|
||||
while (clutter_actor_iter_next (&iter, &child))
|
||||
clutter_actor_show (child);
|
||||
|
||||
clutter_actor_show (self);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_stage_show (ClutterActor *self)
|
||||
{
|
||||
@ -1972,7 +1956,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
|
||||
actor_class->realize = clutter_stage_realize;
|
||||
actor_class->unrealize = clutter_stage_unrealize;
|
||||
actor_class->show = clutter_stage_show;
|
||||
actor_class->show_all = clutter_stage_show_all;
|
||||
actor_class->hide = clutter_stage_hide;
|
||||
actor_class->hide_all = clutter_stage_hide_all;
|
||||
actor_class->queue_relayout = clutter_stage_real_queue_relayout;
|
||||
|
@ -33,9 +33,6 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
CLUTTER_DEPRECATED
|
||||
void clutter_actor_show_all (ClutterActor *self);
|
||||
|
||||
CLUTTER_DEPRECATED_FOR(clutter_actor_set_rotation_angle)
|
||||
void clutter_actor_set_rotation (ClutterActor *self,
|
||||
ClutterRotateAxis axis,
|
||||
|
@ -365,19 +365,6 @@ clutter_group_dispose (GObject *object)
|
||||
G_OBJECT_CLASS (clutter_group_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_group_real_show_all (ClutterActor *self)
|
||||
{
|
||||
ClutterActorIter iter;
|
||||
ClutterActor *actor;
|
||||
|
||||
clutter_actor_iter_init (&iter, self);
|
||||
while (clutter_actor_iter_next (&iter, &actor))
|
||||
clutter_actor_show (actor);
|
||||
|
||||
clutter_actor_show (self);
|
||||
}
|
||||
|
||||
static void
|
||||
clutter_group_real_hide_all (ClutterActor *actor)
|
||||
{
|
||||
@ -428,7 +415,6 @@ clutter_group_class_init (ClutterGroupClass *klass)
|
||||
actor_class->allocate = clutter_group_real_allocate;
|
||||
actor_class->paint = clutter_group_real_paint;
|
||||
actor_class->pick = clutter_group_real_pick;
|
||||
actor_class->show_all = clutter_group_real_show_all;
|
||||
actor_class->hide_all = clutter_group_real_hide_all;
|
||||
actor_class->get_paint_volume = clutter_group_real_get_paint_volume;
|
||||
|
||||
|
@ -197,7 +197,7 @@ test_multitexture (TestUtilsGTestFixture *fixture,
|
||||
|
||||
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -127,7 +127,7 @@ test_texture_mipmaps (TestUtilsGTestFixture *fixture,
|
||||
|
||||
g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -224,7 +224,7 @@ test_texture_pixmap_x11 (TestUtilsGTestFixture *fixture,
|
||||
|
||||
idle_handler = g_idle_add (queue_redraw, state.stage);
|
||||
|
||||
clutter_actor_show_all (state.stage);
|
||||
clutter_actor_show (state.stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -257,7 +257,7 @@ main (int argc, char *argv[])
|
||||
|
||||
make_ui (stage);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
test_atk_text (text_actor);
|
||||
test_atk_text (text_editable_actor);
|
||||
|
@ -178,7 +178,7 @@ main (int argc, char *argv[])
|
||||
g_signal_connect (stage_main, "destroy", G_CALLBACK (clutter_main_quit), NULL);
|
||||
make_ui (stage_main);
|
||||
|
||||
clutter_actor_show_all (stage_main);
|
||||
clutter_actor_show (stage_main);
|
||||
|
||||
if (clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
|
||||
{
|
||||
@ -187,7 +187,7 @@ main (int argc, char *argv[])
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
|
||||
|
||||
make_ui (stage);
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
}
|
||||
|
||||
clutter_main ();
|
||||
|
@ -244,7 +244,7 @@ main (int argc, char *argv[])
|
||||
|
||||
make_ui (stage);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
test_atk_text (text_actor);
|
||||
test_atk_text (text_editable_actor);
|
||||
|
@ -76,7 +76,6 @@ make_ui (ClutterActor *stage)
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), label);
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), editable);
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), rectangle);
|
||||
clutter_actor_show_all (full_entry);
|
||||
clutter_actor_set_scale (full_entry, 2, 1);
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), full_entry);
|
||||
|
||||
@ -84,7 +83,6 @@ make_ui (ClutterActor *stage)
|
||||
cloned_entry = clutter_clone_new (full_entry);
|
||||
clutter_actor_set_position (cloned_entry, 50, 200);
|
||||
clutter_actor_set_scale (cloned_entry, 1, 2);
|
||||
clutter_actor_show_all (cloned_entry);
|
||||
clutter_actor_set_reactive (cloned_entry, TRUE);
|
||||
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), cloned_entry);
|
||||
@ -108,7 +106,7 @@ main (int argc, char *argv[])
|
||||
|
||||
make_ui (stage);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -227,7 +227,7 @@ test_cogl_multitexture_main (int argc, char *argv[])
|
||||
/* start the timeline and thus the animations */
|
||||
clutter_timeline_start (state->timeline);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main();
|
||||
|
||||
|
@ -331,7 +331,7 @@ test_cogl_offscreen_main (int argc, char *argv[])
|
||||
coglbox = test_coglbox_new ();
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -230,7 +230,7 @@ test_cogl_tex_convert_main (int argc, char *argv[])
|
||||
coglbox = test_coglbox_new ();
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -220,7 +220,7 @@ test_cogl_tex_tile_main (int argc, char *argv[])
|
||||
g_signal_connect (timeline, "new-frame", G_CALLBACK (frame_cb), coglbox);
|
||||
clutter_timeline_start (timeline);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -238,7 +238,7 @@ test_devices_main (int argc, char **argv)
|
||||
app);
|
||||
app->stage = stage;
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
|
||||
g_signal_connect (seat,
|
||||
|
@ -467,7 +467,6 @@ test_events_main (int argc, char *argv[])
|
||||
clutter_container_add (CLUTTER_CONTAINER (group), actor, NULL);
|
||||
clutter_container_add (CLUTTER_CONTAINER (stage), group, NULL);
|
||||
clutter_actor_set_position (group, 100, 350);
|
||||
clutter_actor_show_all (group);
|
||||
|
||||
/* border actor */
|
||||
actor = clutter_rectangle_new_with_color (CLUTTER_COLOR_Magenta);
|
||||
@ -480,7 +479,7 @@ test_events_main (int argc, char *argv[])
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
|
||||
g_signal_connect (actor, "event", G_CALLBACK (input_cb), NULL);
|
||||
|
||||
clutter_actor_show_all (CLUTTER_ACTOR (stage));
|
||||
clutter_actor_show (CLUTTER_ACTOR (stage));
|
||||
|
||||
clutter_main();
|
||||
|
||||
|
@ -288,7 +288,7 @@ test_grab_main (int argc, char *argv[])
|
||||
g_signal_connect (actor, "button-press-event",
|
||||
G_CALLBACK (cyan_press_cb), NULL);
|
||||
|
||||
clutter_actor_show_all (CLUTTER_ACTOR (stage));
|
||||
clutter_actor_show (CLUTTER_ACTOR (stage));
|
||||
|
||||
clutter_main();
|
||||
|
||||
|
@ -77,7 +77,7 @@ test_shader_effects_main (int argc, char *argv[])
|
||||
/* start the timeline and thus the animations */
|
||||
clutter_timeline_start (timeline);
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main();
|
||||
|
||||
|
@ -181,7 +181,7 @@ test_swipe_action_main (int argc, char *argv[])
|
||||
offset));
|
||||
}
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_main ();
|
||||
|
||||
|
@ -179,7 +179,7 @@ main (int argc, char *argv[])
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);
|
||||
}
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_threads_add_idle (queue_redraw, stage);
|
||||
|
||||
|
@ -109,7 +109,7 @@ main (int argc, char *argv[])
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (group), label);
|
||||
}
|
||||
}
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
g_signal_connect (stage, "key-press-event",
|
||||
G_CALLBACK (clutter_main_quit), NULL);
|
||||
|
@ -156,7 +156,7 @@ main (int argc, char *argv[])
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);
|
||||
}
|
||||
|
||||
clutter_actor_show_all (stage);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
clutter_perf_fps_start (CLUTTER_STAGE (stage));
|
||||
clutter_threads_add_idle (queue_redraw, stage);
|
||||
|
Loading…
Reference in New Issue
Block a user