From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sat, 14 Nov 2009 16:38:36 +0000 (+0100)
Subject: [libview] Best page calculation only makes sense in continuous mode
X-Git-Tag: EVINCE_2_29_2~12
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2368892a87690b6097a23e4acfcda8e6c5bfc69e;p=evince.git

[libview] Best page calculation only makes sense in continuous mode
---

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 973da901..e917a671 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -609,8 +609,6 @@ view_set_adjustment_values (EvView         *view,
 static void
 view_update_range_and_current_page (EvView *view)
 {
-	gint current_page;
-	gint best_current_page = -1;
 	gint start = view->start_page;
 	gint end = view->end_page;
 	
@@ -623,6 +621,7 @@ view_update_range_and_current_page (EvView *view)
 		GtkBorder border;
 		gboolean found = FALSE;
 		gint area_max = -1, area;
+		gint best_current_page = -1;
 		int i;
 
 		if (!(view->vadjustment && view->hadjustment))
@@ -657,12 +656,20 @@ view_update_range_and_current_page (EvView *view)
 			}
 		}
 
+		if (view->pending_scroll == SCROLL_TO_KEEP_POSITION) {
+			best_current_page = MAX (best_current_page, view->start_page);
+
+			if (view->current_page != best_current_page) {
+				view->current_page = best_current_page;
+				ev_document_model_set_page (view->model, best_current_page);
+			}
+		}
 	} else if (view->dual_page) {
 		if (view->current_page % 2 == get_dual_even_left (view)) {
 			view->start_page = view->current_page;
 			if (view->current_page + 1 < ev_document_get_n_pages (view->document))
 				view->end_page = view->start_page + 1;
-			else 
+			else
 				view->end_page = view->start_page;
 		} else {
 			if (view->current_page < 1)
@@ -676,14 +683,6 @@ view_update_range_and_current_page (EvView *view)
 		view->end_page = view->current_page;
 	}
 
-	best_current_page = MAX (best_current_page, view->start_page);
-	current_page = ev_document_model_get_page (view->model);
-
-	if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) {
-		view->current_page = best_current_page;
-		ev_document_model_set_page (view->model, best_current_page);
-	}
-
 	if (start != view->start_page || end != view->end_page) {
 		gint i;