[sushi] utils: don't use deprecated clutter_cairo_texture_create()
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sushi] utils: don't use deprecated clutter_cairo_texture_create()
- Date: Mon, 19 Mar 2012 20:55:52 +0000 (UTC)
commit d4e73605fccbf3b87af51314f29fc76f96b5d462
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Mar 19 16:53:59 2012 -0400
utils: don't use deprecated clutter_cairo_texture_create()
Connect to the 'draw' signal instead, as the new Clutter API
recommends.
src/libsushi/sushi-utils.c | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/src/libsushi/sushi-utils.c b/src/libsushi/sushi-utils.c
index 8348308..4947941 100644
--- a/src/libsushi/sushi-utils.c
+++ b/src/libsushi/sushi-utils.c
@@ -53,28 +53,21 @@ _cairo_round_rectangle (cairo_t *cr,
}
static void
-rounded_background_allocation_cb (ClutterActor *texture)
+rounded_background_draw_cb (ClutterCairoTexture *texture,
+ cairo_t *cr)
{
- cairo_t *cr;
ClutterActorBox allocation;
+ clutter_actor_get_allocation_box (CLUTTER_ACTOR (texture), &allocation);
clutter_cairo_texture_clear (CLUTTER_CAIRO_TEXTURE (texture));
-
- clutter_actor_get_allocation_box (texture, &allocation);
- clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (texture),
- clutter_actor_box_get_width (&allocation),
- clutter_actor_box_get_height (&allocation));
-
- cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (texture));
_cairo_round_rectangle (cr, allocation.x1, allocation.y1,
- clutter_actor_box_get_width (&allocation),
- clutter_actor_box_get_height (&allocation),
+ allocation.x2 - allocation.x1,
+ allocation.y2 - allocation.y1,
6.0);
cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
cairo_fill (cr);
- cairo_destroy (cr);
}
/**
@@ -88,8 +81,10 @@ sushi_create_rounded_background (void)
ClutterActor *retval;
retval = clutter_cairo_texture_new (1, 1);
- g_signal_connect (retval, "notify::allocation",
- G_CALLBACK (rounded_background_allocation_cb), NULL);
+ clutter_cairo_texture_set_auto_resize (CLUTTER_CAIRO_TEXTURE (retval), TRUE);
+
+ g_signal_connect (retval, "draw",
+ G_CALLBACK (rounded_background_draw_cb), NULL);
return retval;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]