[gthumb] Revert "slideshow: removed use of GTK_CLUTTER_TEXTURE"
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] Revert "slideshow: removed use of GTK_CLUTTER_TEXTURE"
- Date: Tue, 25 Oct 2011 14:56:00 +0000 (UTC)
commit 079f04dd8cbf3a81846de24d8974477b839ef744
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Oct 21 15:46:03 2011 +0200
Revert "slideshow: removed use of GTK_CLUTTER_TEXTURE"
This reverts commit a17a41560acf312095c69cc740e9e66cd3056001.
extensions/slideshow/gth-slideshow.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/extensions/slideshow/gth-slideshow.c b/extensions/slideshow/gth-slideshow.c
index a2c3f10..f84e77d 100644
--- a/extensions/slideshow/gth-slideshow.c
+++ b/extensions/slideshow/gth-slideshow.c
@@ -694,6 +694,7 @@ hide_paused_sign_cb (gpointer user_data)
static void
default_projector_pause_painter (GthImageViewer *image_viewer,
+ GdkEventExpose *event,
cairo_t *cr,
gpointer user_data)
{
@@ -963,7 +964,7 @@ clutter_projector_image_ready (GthSlideshow *self,
texture = self->priv->image1;
else
texture = self->priv->image2;
- gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), image, NULL);
+ gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (texture), image, NULL);
self->next_geometry.x = 0;
self->next_geometry.y = 0;
@@ -1146,7 +1147,7 @@ adapt_image_size_to_stage_size (GthSlideshow *self)
texture = self->priv->image1;
else
texture = self->priv->image2;
- gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), image, NULL);
+ gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (texture), image, NULL);
self->current_geometry.x = 0;
self->current_geometry.y = 0;
@@ -1202,12 +1203,17 @@ clutter_projector_construct (GthSlideshow *self)
self->priv->alpha = clutter_alpha_new_full (self->priv->timeline, CLUTTER_EASE_IN_OUT_SINE);
+ self->priv->paused_actor = gtk_clutter_texture_new ();
if (self->priv->pause_pixbuf != NULL)
- self->priv->paused_actor = gtk_clutter_texture_new_from_pixbuf (self->priv->pause_pixbuf);
+ gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (self->priv->paused_actor),
+ self->priv->pause_pixbuf,
+ NULL);
else
- self->priv->paused_actor = gtk_clutter_texture_new_from_stock (GTK_WIDGET (self),
- GTK_STOCK_MEDIA_PAUSE,
- GTK_ICON_SIZE_DIALOG);
+ gtk_clutter_texture_set_from_stock (GTK_CLUTTER_TEXTURE (self->priv->paused_actor),
+ GTK_WIDGET (self),
+ GTK_STOCK_MEDIA_PAUSE,
+ GTK_ICON_SIZE_DIALOG,
+ NULL);
clutter_actor_hide (self->priv->paused_actor);
clutter_container_add_actor (CLUTTER_CONTAINER (self->stage), self->priv->paused_actor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]