From c90df4d4a052cd12f11ac670a9d1d343fd715a18 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 29 Apr 2008 13:51:25 +0000 Subject: [PATCH] 2008-04-29 Robert Bragg * clutter/x11/clutter-x11-texture-pixmap.c: In clutter_x11_texture_pixmap_set_pixmap, dont assume that the actor size should be changed to match the size of the pixmap. --- ChangeLog | 6 ++++++ clutter/x11/clutter-x11-texture-pixmap.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15f34f8ab..b8f159d23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-29 Robert Bragg + + * clutter/x11/clutter-x11-texture-pixmap.c: + In clutter_x11_texture_pixmap_set_pixmap, dont assume that the actor + size should be changed to match the size of the pixmap. + 2008-04-29 Robert Bragg * clutter/cogl/gles/cogl-texture.c: diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index 5dc29cb87..55ebbc830 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -705,9 +705,6 @@ clutter_x11_texture_pixmap_set_pixmap (ClutterX11TexturePixmap *texture, priv->pixmap_width, priv->pixmap_height); } - - clutter_actor_set_size (CLUTTER_ACTOR(texture), - priv->pixmap_width, priv->pixmap_height); } /**