From 2c027febd41098f2b2157d30210cc386fbbfdef8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sat, 29 Sep 2007 14:38:33 +0000 Subject: Give priority to form fields over images when deciding whether a button 2007-09-29 Carlos Garcia Campos * shell/ev-view.c: (ev_view_button_press_event): Give priority to form fields over images when deciding whether a button press event is over an image or form field. It allows edit form fields when they are over a background image. Fixes bug #477841. svn path=/trunk/; revision=2689 --- (limited to 'shell') diff --git a/shell/ev-view.c b/shell/ev-view.c index 761594a..ed55a11 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -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); -- cgit v0.9.1