[evolution-patches] 61932, gal

[Not Zed <notzed ximian com>]

seems like a hack.  *shrug*  works for me, for this bug at least.

the 'window' coordinate is relative to the scrolled window, so we need to take that into account for the popup position which isn't relative to that window.

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: gal/e-table/ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.938
diff -u -3 -r1.938 ChangeLog
--- gal/e-table/ChangeLog	4 Aug 2004 09:16:19 -0000	1.938
+++ gal/e-table/ChangeLog	9 Aug 2004 05:28:30 -0000
@@ -1,3 +1,9 @@
+2004-08-09  Not Zed  <NotZed Ximian com>
+
+	* e-cell-combo.c (e_cell_combo_get_popup_pos): include scrollbar
+	offset in vertical calculation.  don't ask me i just work here.
+	see #61932.
+
 2004-08-02  Radek Doulik  <rodo ximian com>
 
 	* e-table-config.c (e_table_config_construct): do not set
Index: gal/e-table/e-cell-combo.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-cell-combo.c,v
retrieving revision 1.16
diff -u -3 -r1.16 e-cell-combo.c
--- gal/e-table/e-cell-combo.c	14 Nov 2003 10:12:31 -0000	1.16
+++ gal/e-table/e-cell-combo.c	9 Aug 2004 05:28:31 -0000
@@ -412,13 +412,15 @@
 				      y1,
 				      &wx,
 				      &wy);
+
 	x1 = wx;
 	y1 = wy;
-	
+
 	*x += x1;
-	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
-	*y += y1 + 1;
+	/* The ETable positions don't include the grid lines, I think, so we add 1. */
+	*y += y1 + 1
+		- (int)((GnomeCanvas *)canvas)->layout.vadjustment->value
+		+ ((GnomeCanvas *)canvas)->zoom_yofs;
 
 	scrollbar_width = popup->vscrollbar->requisition.width
 		+ GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT_GET_CLASS (popup))->scrollbar_spacing;