diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2008-02-29 09:23:30 (GMT) |
|---|---|---|
| committer | Carlos Garnacho <carlosg@src.gnome.org> | 2008-02-29 09:23:30 (GMT) |
| commit | f51872613abaaa42c716e2fe6a2e4695c529dc4b (patch) | |
| tree | 2a45fde09670e8005b22807ff847f3c51372be1d /shell/ev-view.c | |
| parent | caf531bb6f29b940687528ace8c4b2c77f925a05 (diff) | |
Added. Returns whether the animation has everything necessary to run. Do
2008-02-29 Carlos Garnacho <carlosg@gnome.org>
* shell/ev-transition-animation.[ch] (ev_transition_animation_ready):
Added. Returns whether the animation has everything necessary to run.
* shell/ev-view.c (ev_view_expose_event): Do not assume the animation
is ready just because it's been created. Fixes #519106.
(draw_one_page): Do not show the "Loading..." text in presentation
mode, there was a slim probability that this could happen.
svn path=/trunk/; revision=2933
Diffstat (limited to 'shell/ev-view.c')
| -rw-r--r-- | shell/ev-view.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/ev-view.c b/shell/ev-view.c index 3b7a60d..129d87c 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -2483,7 +2483,7 @@ ev_view_expose_event (GtkWidget *widget, cairo_t *cr; gint i; - if (view->animation) { + if (view->animation && ev_transition_animation_ready (view->animation)) { GdkRectangle page_area; GtkBorder border; @@ -3739,9 +3739,12 @@ draw_one_page (EvView *view, page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page); if (!page_surface) { - draw_loading_text (view, - &real_page_area, - expose_area); + if (!view->presentation) { + draw_loading_text (view, + &real_page_area, + expose_area); + } + *page_ready = FALSE; return; |