From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Thu, 1 Feb 2007 11:08:45 +0000 (+0000)
Subject: Do not start an image drag and drop operation when pointer is on text, so
X-Git-Tag: EVINCE_0_7_2~38
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=6c62b0a490428aea7a3974b96871851477c81deb;p=evince.git

Do not start an image drag and drop operation when pointer is on text, so

2007-02-01  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-view.c: (ev_view_button_press_event):
	Do not start an image drag and drop operation when pointer is on
	text, so that we can select text when the whole background is an
	image.

svn path=/trunk/; revision=2283
---

diff --git a/ChangeLog b/ChangeLog
index 155c56c0..4bad1344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-01  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* shell/ev-view.c: (ev_view_button_press_event):
+
+	Do not start an image drag and drop operation when pointer is on 
+	text, so that we can select text when the whole background is an
+	image. 
+
 2007-01-31  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-window.c: (ev_window_update_actions): 
diff --git a/shell/ev-view.c b/shell/ev-view.c
index 676d08d0..0186a021 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -2004,7 +2004,8 @@ ev_view_button_press_event (GtkWidget      *widget,
 				}
 				
 				gtk_widget_queue_draw (widget);
-			} else if ((image = ev_view_get_image_at_location (view, 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)
 					g_object_unref (view->image_dnd_info.image);
 				view->image_dnd_info.image = g_object_ref (image);