From: Carlos Garnacho Date: Fri, 4 Jan 2008 20:26:33 +0000 (+0000) Subject: Implement "split" effect. X-Git-Tag: EVINCE_2_21_90~69 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=1d75fddea8eab6fa418fd6ff7434462e121d69f4;p=evince.git Implement "split" effect. 2008-01-04 Carlos Garnacho * shell/ev-transition-animation.c (ev_transition_animation_split) (ev_transition_animation_paint): Implement "split" effect. svn path=/trunk/; revision=2801 --- diff --git a/ChangeLog b/ChangeLog index c82fc3c0..0fd0c80f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-04 Carlos Garnacho + + * shell/ev-transition-animation.c (ev_transition_animation_split) + (ev_transition_animation_paint): Implement "split" effect. + 2008-01-04 Carlos Garnacho * shell/ev-view-private.h: Add a EvTransitionAnimation to the struct. diff --git a/shell/ev-transition-animation.c b/shell/ev-transition-animation.c index 13c8f01c..e2bc3234 100644 --- a/shell/ev-transition-animation.c +++ b/shell/ev-transition-animation.c @@ -217,6 +217,71 @@ paint_surface (cairo_t *cr, cairo_restore (cr); } +/* animations */ +static void +ev_transition_animation_split (cairo_t *cr, + EvTransitionAnimation *animation, + EvTransitionEffect *effect, + gdouble progress, + GdkRectangle page_area) +{ + EvTransitionAnimationPriv *priv; + EvTransitionEffectAlignment alignment; + EvTransitionEffectDirection direction; + gint width, height; + + priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation); + width = page_area.width; + height = page_area.height; + + g_object_get (effect, + "alignment", &alignment, + "direction", &direction, + NULL); + + if (direction == EV_TRANSITION_DIRECTION_INWARD) { + paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area); + + if (alignment == EV_TRANSITION_ALIGNMENT_HORIZONTAL) { + cairo_rectangle (cr, + 0, + height * progress / 2, + width, + height * (1 - progress)); + } else { + cairo_rectangle (cr, + width * progress / 2, + 0, + width * (1 - progress), + height); + } + + cairo_clip (cr); + + paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area); + } else { + paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area); + + if (alignment == EV_TRANSITION_ALIGNMENT_HORIZONTAL) { + cairo_rectangle (cr, + 0, + (height / 2) - (height * progress / 2), + width, + height * progress); + } else { + cairo_rectangle (cr, + (width / 2) - (width * progress / 2), + 0, + width * progress, + height); + } + + cairo_clip (cr); + + paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area); + } +} + void ev_transition_animation_paint (EvTransitionAnimation *animation, cairo_t *cr, @@ -243,6 +308,9 @@ ev_transition_animation_paint (EvTransitionAnimation *animation, /* just paint the destination slide */ paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area); break; + case EV_TRANSITION_EFFECT_SPLIT: + ev_transition_animation_split (cr, animation, priv->effect, progress, page_area); + break; default: { GEnumValue *enum_value;