isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-25 12:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/clutter/easing: Use ClutterCanvas

Browse Source 
Remove the usage of ClutterCairoTexture and use a ClutterCanvas content
instead.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/932
This commit is contained in:
Jonas Ådahl 2019-11-12 18:39:24 +01:00 committed by Georges Basile Stavracas Neto
parent 14bb104ef0
commit e0ebc4de60
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tests/clutter/interactive/test-easing.c
View File

@ -136,19 +136,21 @@ on_button_press (ClutterActor *actor,
} }
static gboolean static gboolean
draw_bouncer (ClutterCairoTexture *texture, draw_bouncer (ClutterCanvas *canvas,
cairo_t *cr) cairo_t *cr,
int width,
int height)
{ {
const ClutterColor *bouncer_color; const ClutterColor *bouncer_color;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
guint width, height;
float radius; float radius;
clutter_cairo_texture_get_surface_size (texture, &width, &height);
radius = MAX (width, height); radius = MAX (width, height);
clutter_cairo_texture_clear (texture); cairo_save (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
cairo_paint (cr);
cairo_restore (cr);
cairo_arc (cr, radius / 2, radius / 2, radius / 2, 0.0, 2.0 * G_PI); cairo_arc (cr, radius / 2, radius / 2, radius / 2, 0.0, 2.0 * G_PI);
@ -181,18 +183,22 @@ static ClutterActor *
make_bouncer (gfloat width, make_bouncer (gfloat width,
gfloat height) gfloat height)
{ {
ClutterContent *canvas;
ClutterActor *retval; ClutterActor *retval;
retval = clutter_cairo_texture_new (width, height); canvas = clutter_canvas_new ();
g_signal_connect (retval, "draw", G_CALLBACK (draw_bouncer), NULL); clutter_canvas_set_size (CLUTTER_CANVAS (canvas), width, height);
g_signal_connect (canvas, "draw", G_CALLBACK (draw_bouncer), NULL);
retval = g_object_new (CLUTTER_TYPE_ACTOR,
"content", canvas,
NULL);
clutter_actor_set_name (retval, "bouncer"); clutter_actor_set_name (retval, "bouncer");
clutter_actor_set_size (retval, width, height); clutter_actor_set_size (retval, width, height);
clutter_actor_set_anchor_point (retval, width / 2, height / 2); clutter_actor_set_anchor_point (retval, width / 2, height / 2);
clutter_actor_set_reactive (retval, TRUE); clutter_actor_set_reactive (retval, TRUE);
/* make sure we draw the bouncer immediately */ clutter_content_invalidate (canvas);
clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (retval));
return retval; return retval;
} }