diff options
| author | Jonas Dreßler <verdre@v0yd.nl> | 2020-10-23 21:14:38 +0200 |
|---|---|---|
| committer | Jonas Dreßler <verdre@v0yd.nl> | 2020-10-23 22:06:58 +0200 |
| commit | 4e63ed524ed1f7feadcede4b275deea1169617a3 (patch) | |
| tree | 19b5c202339fe10a5d8d1e619b3c8185a34a1bd9 /src/tests/clutter/interactive | |
| parent | a03e233b44c58dc6f5113eb7bb65e5ef47490018 (diff) | |
| download | mutter-4e63ed524ed1f7feadcede4b275deea1169617a3.tar.gz | |
tests: Use ClutterStage "after-paint" instead of ClutterActor "paint"
The "paint" signal of ClutterActor is deprecated and will be removed. We
have a good replacement to get notified about stage paints nowadays,
that is "after-paint" on ClutterStage, so switch to that signal where it
makes sense.
I didn't bother to update the few tests (namely Clutters
conform/texture-fbo.c, conform/text-cache.c,
interactive/test-cogl-multitexture.c and Cogls
conform/test-multitexture.c, conform/test-texture-mipmaps.c) where it's
harder to replace the signal since we don't build those anyway.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1522
Diffstat (limited to 'src/tests/clutter/interactive')
| -rw-r--r-- | src/tests/clutter/interactive/test-cogl-point-sprites.c | 8 | ||||
| -rw-r--r-- | src/tests/clutter/interactive/test-cogl-shader-glsl.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/tests/clutter/interactive/test-cogl-point-sprites.c b/src/tests/clutter/interactive/test-cogl-point-sprites.c index 681fdb71f..9d6027274 100644 --- a/src/tests/clutter/interactive/test-cogl-point-sprites.c +++ b/src/tests/clutter/interactive/test-cogl-point-sprites.c @@ -97,9 +97,9 @@ generate_round_texture (void) } static void -paint_cb (ClutterActor *stage, - ClutterPaintContext *paint_context, - Data *data) +on_after_paint (ClutterActor *stage, + ClutterPaintContext *paint_context, + Data *data) { CoglFramebuffer *framebuffer = clutter_paint_context_get_framebuffer (paint_context); @@ -258,7 +258,7 @@ test_cogl_point_sprites_main (int argc, char *argv[]) clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Point Sprites"); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL); - g_signal_connect_after (stage, "paint", G_CALLBACK (paint_cb), &data); + g_signal_connect (CLUTTER_STAGE (stage), "after-paint", G_CALLBACK (on_after_paint), &data); clutter_actor_show (stage); diff --git a/src/tests/clutter/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c index b25789e06..62b16e772 100644 --- a/src/tests/clutter/interactive/test-cogl-shader-glsl.c +++ b/src/tests/clutter/interactive/test-cogl-shader-glsl.c @@ -166,8 +166,8 @@ static unsigned int timeout_id = 0; static int shader_no = 0; static void -paint_cb (ClutterActor *actor, - ClutterPaintContext *paint_context) +on_after_paint (ClutterActor *actor, + ClutterPaintContext *paint_context) { CoglFramebuffer *framebuffer = clutter_paint_context_get_framebuffer (paint_context); @@ -326,7 +326,7 @@ test_cogl_shader_glsl_main (int argc, char *argv[]) cogl_material_set_layer (material, 0, redhand); set_shader_num (0); - g_signal_connect_after (stage, "paint", G_CALLBACK (paint_cb), NULL); + g_signal_connect (CLUTTER_STAGE (stage), "after-paint", G_CALLBACK (on_after_paint), NULL); clutter_actor_set_reactive (stage, TRUE); g_signal_connect (stage, "button-release-event", |