From 5ecf2bfd3311cfb403a6a6446ee6e10f6a410413 Mon Sep 17 00:00:00 2001 From: Cesar Fernandez Date: Thu, 21 Jun 2007 14:20:45 +0000 Subject: [PATCH] Do not change current page when returning from black/white mode in 2007-06-21 Cesar Fernandez * shell/ev-view.c: (ev_view_next_page), (ev_view_previous_page): Do not change current page when returning from black/white mode in presentation. Fixes bug #415032. svn path=/branches/gnome-2-18/; revision=2516 --- ChangeLog | 7 +++++++ shell/ev-view.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index ed9cbc56..0d2c9dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-21 Cesar Fernandez + + * shell/ev-view.c: (ev_view_next_page), (ev_view_previous_page): + + Do not change current page when returning from black/white mode in + presentation. Fixes bug #415032. + 2007-06-17 Carlos Garcia Campos * shell/ev-window.c: (ev_window_clear_print_job): diff --git a/shell/ev-view.c b/shell/ev-view.c index 513ba871..cd20a8c9 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -4884,6 +4884,13 @@ ev_view_next_page (EvView *view) if (!view->page_cache) return FALSE; + if (view->presentation && + (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE)) { + ev_view_reset_presentation_state (view); + return FALSE; + } + ev_view_presentation_transition_stop (view); ev_view_reset_presentation_state (view); @@ -4926,6 +4933,13 @@ ev_view_previous_page (EvView *view) return TRUE; } + if (view->presentation && + (view->presentation_state == EV_PRESENTATION_BLACK || + view->presentation_state == EV_PRESENTATION_WHITE)) { + ev_view_reset_presentation_state (view); + return FALSE; + } + ev_view_reset_presentation_state (view); page = ev_page_cache_get_current_page (view->page_cache); -- 2.43.5