diff options
| -rw-r--r-- | widgets/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/misc/e-cell-date-edit.c | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index b08c9683dc..d01d0fb2db 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2004-10-06 JP Rosevear <jpr@novell.com> + + Fixes #66164 + + * e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): replicate + fix to e-cell-combo.c by NotZed + 2004-10-01 Not Zed <NotZed@Ximian.com> * e-util-marshal.list: added boolean object boxed. diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 737c7da14f..5564f20ea6 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -610,10 +610,15 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, &wx, &wy); - *x += wx; + x1 = wx; + y1 = wy; + + *x += x1; /* The ETable positions don't include the grid lines, I think, so we add 1. */ - *y += wy + 1; + *y += y1 + 1 + - (int)((GnomeCanvas *)canvas)->layout.vadjustment->value + + ((GnomeCanvas *)canvas)->zoom_yofs; avail_height = gdk_screen_height () - *y; |