Commit 65f9d546 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Fall back to the default positioning when the menuitem is not realized.


        * gtk/gtkmenuitem.c: Fall back to the default positioning when
        the menuitem is not realized. Patch by Björn Lindqvist.



svn path=/trunk/; revision=20754
parent 8f6aa13b
2008-07-03 Matthias Clasen <mclasen@redhat.com>
Bug 540618 – gtk_menu_shell_select_first prints warning on GtkMenubar
constructed using GtkUIManager
* gtk/gtkmenuitem.c: Fall back to the default positioning when
the menuitem is not realized. Patch by Björn Lindqvist.
2008-07-03 Matthias Clasen <mclasen@redhat.com>
Bug 540612 – mem leak in filechooser
......
......@@ -1141,6 +1141,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget,
if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu))
{
gboolean take_focus;
GtkMenuPositionFunc menu_position_func;
take_focus = gtk_menu_shell_get_take_focus (GTK_MENU_SHELL (widget->parent));
gtk_menu_shell_set_take_focus (GTK_MENU_SHELL (menu_item->submenu),
......@@ -1162,10 +1163,21 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget,
"gtk-menu-exact-popup-time", NULL);
}
/* gtk_menu_item_position_menu positions the submenu from the
* menuitems position. If the menuitem doesn't have a window,
* that doesn't work. In that case we use the default
* positioning function instead which places the submenu at the
* mouse cursor.
*/
if (widget->window)
menu_position_func = gtk_menu_item_position_menu;
else
menu_position_func = NULL;
gtk_menu_popup (GTK_MENU (menu_item->submenu),
widget->parent,
widget,
gtk_menu_item_position_menu,
menu_position_func,
menu_item,
GTK_MENU_SHELL (widget->parent)->button,
0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment