X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view.c;h=78266944ac9ad6d47292a989e6d3ffa7203ea704;hb=e044f1f34f994c99ed4cd7744ef3d8af877ca103;hp=0a63403ece0df16bcefec1ac2cc82dfff724943a;hpb=fb9aea3630e9cc119b41e03aa431f9a694efd62e;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 0a63403e..78266944 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -544,6 +544,8 @@ view_update_range_and_current_page (EvView *view)
 				view->start_page = view->current_page;
 				if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
 					view->end_page = view->start_page + 1;
+				else 
+					view->end_page = view->start_page;
 			} else {
 				view->start_page = view->current_page - 1;
 				view->end_page = view->current_page;
@@ -687,10 +689,10 @@ ev_view_binding_activated (EvView *view,
 	if (view->presentation) {
 		switch (scroll) {
 			case GTK_SCROLL_STEP_BACKWARD:
-				ev_page_cache_prev_page (view->page_cache);
+				ev_view_previous_page (view);
 				break;
 			case GTK_SCROLL_STEP_FORWARD:
-				ev_page_cache_next_page (view->page_cache);
+				ev_view_next_page (view);
 				break;
 			default:
 				break;
@@ -3005,15 +3007,19 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction)
 gboolean
 ev_view_can_find_next (EvView *view)
 {
-	int n_results = 0;
-
 	if (EV_IS_DOCUMENT_FIND (view->document)) {
 		EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+		int i, n_pages;
 
-		n_results = ev_document_find_get_n_results (find, view->current_page);
+		n_pages = ev_page_cache_get_n_pages (view->page_cache);
+		for (i = 0; i < n_pages; i++) {
+			if (ev_document_find_get_n_results (find, i) > 0) {
+				return TRUE;
+			}
+		}
 	}
 
-	return n_results > 0;
+	return FALSE;
 }
 
 void
@@ -3567,6 +3573,42 @@ ev_view_show_cursor (EvView *view)
        ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
 }
 
+gboolean
+ev_view_next_page (EvView *view)
+{
+	int page;
+
+	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
+
+	page = ev_page_cache_get_current_page (view->page_cache);
+	page = ev_view_get_dual_page (view) ? page + 2 : page + 1;
+
+	if (page < ev_page_cache_get_n_pages (view->page_cache)) {
+		ev_page_cache_set_current_page (view->page_cache, page);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+gboolean
+ev_view_previous_page (EvView *view)
+{
+	int page;
+
+	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
+
+	page = ev_page_cache_get_current_page (view->page_cache);
+	page = ev_view_get_dual_page (view) ? page - 2 : page - 1;
+
+	if (page >= 0) {
+		ev_page_cache_set_current_page (view->page_cache, page);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
 /*** Enum description for usage in signal ***/
 
 GType
@@ -3584,4 +3626,3 @@ ev_sizing_mode_get_type (void)
   }
   return etype;
 }
-