[evolution-patches] Re: another coordinates fix

[Radek Doulík <rodo ximian com>]

complete version

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1813
diff -u -p -r1.1813 ChangeLog
--- ChangeLog	25 Jun 2003 18:15:45 -0000	1.1813
+++ ChangeLog	26 Jun 2003 15:24:13 -0000
@@ -1,3 +1,8 @@
+2003-06-26  Radek Doulik  <rodo ximian com>
+
+	* gtkhtml.c (button_press_event): fix coordinates
+	(shift_to_iframe_parent): ditto
+
 2003-06-24  Larry Ewing  <lewing ximian com>
 
 	* htmlengine.c (parse_body): add helper functions to push/pop clue
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.518
diff -u -p -r1.518 gtkhtml.c
--- gtkhtml.c	25 Jun 2003 18:15:46 -0000	1.518
+++ gtkhtml.c	26 Jun 2003 15:24:15 -0000
@@ -1353,9 +1353,9 @@ shift_to_iframe_parent (GtkWidget *widge
 {
 	while (GTK_HTML (widget)->iframe_parent) {
 		if (x)
-			*x += widget->allocation.x;
+			*x += widget->allocation.x - GTK_HTML (widget)->engine->x_offset;
 		if (y)
-			*y += widget->allocation.y;
+			*y += widget->allocation.y - GTK_HTML (widget)->engine->y_offset;
 
 		widget = GTK_HTML (widget)->iframe_parent;
 		
@@ -1481,7 +1481,7 @@ button_press_event (GtkWidget *widget,
 				HTMLEngine *orig_e;
 
 				orig_e = GTK_HTML (orig_widget)->engine;
-				obj = html_engine_get_object_at (engine, x + engine->x_offset, y + engine->y_offset,
+				obj = html_engine_get_object_at (engine, x, y,
 								 NULL, FALSE);
 				if (obj && ((HTML_IS_IMAGE (obj) && HTML_IMAGE (obj)->url && *HTML_IMAGE (obj)->url)
 					    || HTML_IS_LINK_TEXT (obj)))