diff options
| -rw-r--r-- | src/compositor/meta-shaped-texture.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index 12a5c703a..9145d3c31 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -40,8 +40,6 @@ static void meta_shaped_texture_dispose (GObject *object); static void meta_shaped_texture_paint (ClutterActor *actor); -static void meta_shaped_texture_pick (ClutterActor *actor, - const ClutterColor *color); static void meta_shaped_texture_get_preferred_width (ClutterActor *self, gfloat for_height, @@ -88,7 +86,6 @@ meta_shaped_texture_class_init (MetaShapedTextureClass *klass) actor_class->get_preferred_width = meta_shaped_texture_get_preferred_width; actor_class->get_preferred_height = meta_shaped_texture_get_preferred_height; actor_class->paint = meta_shaped_texture_paint; - actor_class->pick = meta_shaped_texture_pick; actor_class->get_paint_volume = meta_shaped_texture_get_paint_volume; g_type_class_add_private (klass, sizeof (MetaShapedTexturePrivate)); @@ -357,56 +354,6 @@ meta_shaped_texture_paint (ClutterActor *actor) } static void -meta_shaped_texture_pick (ClutterActor *actor, - const ClutterColor *color) -{ - MetaShapedTexture *stex = (MetaShapedTexture *) actor; - MetaShapedTexturePrivate *priv = stex->priv; - - /* If there is no region then use the regular pick */ - if (priv->mask_texture == NULL) - CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)->pick (actor, color); - else if (clutter_actor_should_pick_paint (actor)) - { - CoglTexture *paint_tex; - ClutterActorBox alloc; - guint tex_width, tex_height; - CoglPipeline *pipeline; - CoglContext *ctx; - CoglFramebuffer *fb; - CoglColor cogl_color; - - paint_tex = COGL_TEXTURE (priv->texture); - - if (paint_tex == NULL) - return; - - tex_width = cogl_texture_get_width (paint_tex); - tex_height = cogl_texture_get_height (paint_tex); - - if (tex_width == 0 || tex_height == 0) /* no contents yet */ - return; - - ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ()); - fb = cogl_get_draw_framebuffer (); - - cogl_color_init_from_4ub (&cogl_color, color->red, color->green, color->blue, color->alpha); - - pipeline = get_masked_pipeline (ctx); - cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture); - cogl_pipeline_set_color (pipeline, &cogl_color); - - clutter_actor_get_allocation_box (actor, &alloc); - - cogl_framebuffer_draw_rectangle (fb, pipeline, - 0, 0, - alloc.x2 - alloc.x1, - alloc.y2 - alloc.y1); - cogl_object_unref (pipeline); - } -} - -static void meta_shaped_texture_get_preferred_width (ClutterActor *self, gfloat for_height, gfloat *min_width_p, |