Call gnome_canvas_world_to_window here. Finishes fixing Ximian bug #2613.

2001-10-04  Christopher James Lahey  <clahey@ximian.com>

	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): Call
	gnome_canvas_world_to_window here.  Finishes fixing Ximian bug
	#2613.

svn path=/trunk/; revision=13405
This commit is contained in:
Christopher James Lahey
2001-10-04 07:22:56 +00:00
committed by Chris Lahey
parent af4db12679
commit ee35e29394
2 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2001-10-04 Christopher James Lahey <clahey@ximian.com>
* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): Call
gnome_canvas_world_to_window here. Finishes fixing Ximian bug
#2613.
2001-09-18 Damon Chaplin <damon@ximian.com>
* e-dateedit.c (e_date_edit_grab_focus): grab focus to the date entry

View File

@ -546,7 +546,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde,
GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
GtkRequisition popup_requisition;
gint avail_height, screen_width, column_width, row_height;
double x1, y1;
double x1, y1, wx, wy;
gdk_window_get_origin (canvas->window, x, y);
@ -558,10 +558,16 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde,
eti->editing_row + 1);
gnome_canvas_item_i2w (GNOME_CANVAS_ITEM (eti), &x1, &y1);
*x += x1;
gnome_canvas_world_to_window (GNOME_CANVAS (canvas),
x1,
y1,
&wx,
&wy);
*x += wx;
/* The ETable positions don't include the grid lines, I think, so we
add 1. */
*y += y1 + 1;
*y += wy + 1;
avail_height = gdk_screen_height () - *y;