X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=ed55a110b78c8a8dd6c6ceee11dee081b5a094b9;hb=595d902c5518765e086e8a911124ef36ed9300b7;hp=60f82e3d8433d3c176897540dcdd73a7d3e945d3;hpb=c12e2f7c2d59af4e4f5fddec97f24970e6d9d5c4;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 60f82e3d..ed55a110 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -489,7 +489,7 @@ view_update_range_and_current_page (EvView *view)
 				}
 
 				view->end_page = i;
-			} else if (found) {
+			} else if (found && view->current_page <= view->end_page) {
 				break;
 			}
 		}
@@ -2659,6 +2659,9 @@ ev_view_button_press_event (GtkWidget      *widget,
 				}
 
 				gtk_widget_queue_draw (widget);
+			} else if ((field = ev_view_get_form_field_at_location (view, event->x, event->y))) {
+				ev_view_remove_all (view);
+				ev_view_handle_form_field (view, field, event->x, event->y);
 			} else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
 				   (image = ev_view_get_image_at_location (view, event->x, event->y))) {
 				if (view->image_dnd_info.image)
@@ -2668,9 +2671,6 @@ ev_view_button_press_event (GtkWidget      *widget,
 
 				view->image_dnd_info.start.x = event->x + view->scroll_x;
 				view->image_dnd_info.start.y = event->y + view->scroll_y;
-			} else if ((field = ev_view_get_form_field_at_location (view, event->x, event->y))) {
-				ev_view_remove_all (view);
-				ev_view_handle_form_field (view, field, event->x, event->y);
 			} else {
 				ev_view_remove_all (view);