From a95a2f5a696e14f9ebda08692f7e1c596de794d0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 31 Mar 2003 18:25:45 +0000 Subject: Fixes #39961 2003-03-31 Rodrigo Moya Fixes #39961 * gui/e-meeting-time-sel.c (e_meeting_time_selector_options_menu_position_callback): (e_meeting_time_selector_autopick_menu_position_callback): use the button's allocation to position the popup menu. svn path=/trunk/; revision=20599 --- calendar/gui/e-meeting-time-sel.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel.c') diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 7b41074085..fec13635f5 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1413,21 +1413,12 @@ 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. */ - gdk_window_get_origin (mts->options_button->window, x, y); - *y += mts->options_button->allocation.height; - - /* 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); + *x = mts->options_button->allocation.x; + *y = mts->options_button->allocation.y + mts->options_button->allocation.height; } static void @@ -1461,21 +1452,12 @@ 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. */ - gdk_window_get_origin (mts->autopick_button->window, x, y); - *y += mts->autopick_button->allocation.height; - - /* 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); + *x = mts->autopick_button->allocation.x; + *y = mts->autopick_button->allocation.y + mts->autopick_button->allocation.height; } -- cgit