diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 28 |
2 files changed, 31 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f1311a75cf..d80f6b5898 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2003-04-10 Rodrigo Moya <rodrigo@ximian.com> + + * gui/e-meeting-time-sel.c + (e_meeting_time_selector_options_menu_position_callback): + (e_meeting_time_selector_autopick_menu_position_callback): added the + allocation's X and Y position to the calculated coordinates. + 2003-04-10 JP Rosevear <jpr@ximian.com> Fixes #41127 diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index a2f06acb4c..e902d01f61 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1438,12 +1438,22 @@ e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu, gpointer user_data) { EMeetingTimeSelector *mts; + GtkRequisition menu_requisition; + gint max_x, max_y; mts = E_MEETING_TIME_SELECTOR (user_data); /* Calculate our preferred position. */ - *x = mts->options_button->allocation.x; - *y = mts->options_button->allocation.y + mts->options_button->allocation.height; + gdk_window_get_origin (mts->options_button->window, x, y); + *x += mts->options_button->allocation.x; + *y += mts->options_button->allocation.y + mts->options_button->allocation.height / 2 - 2; + + /* Now make sure we are on the screen. */ + gtk_widget_size_request (mts->options_menu, &menu_requisition); + max_x = MAX (0, gdk_screen_width () - menu_requisition.width); + max_y = MAX (0, gdk_screen_height () - menu_requisition.height); + *x = CLAMP (*x, 0, max_x); + *y = CLAMP (*y, 0, max_y); } static void @@ -1477,12 +1487,22 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, gpointer user_data) { EMeetingTimeSelector *mts; + GtkRequisition menu_requisition; + gint max_x, max_y; mts = E_MEETING_TIME_SELECTOR (user_data); /* Calculate our preferred position. */ - *x = mts->autopick_button->allocation.x; - *y = mts->autopick_button->allocation.y + mts->autopick_button->allocation.height; + gdk_window_get_origin (mts->autopick_button->window, x, y); + *x += mts->autopick_button->allocation.x; + *y += mts->autopick_button->allocation.y + mts->autopick_button->allocation.height / 2 - 2; + + /* Now make sure we are on the screen. */ + gtk_widget_size_request (mts->autopick_menu, &menu_requisition); + max_x = MAX (0, gdk_screen_width () - menu_requisition.width); + max_y = MAX (0, gdk_screen_height () - menu_requisition.height); + *x = CLAMP (*x, 0, max_x); + *y = CLAMP (*y, 0, max_y); } |