AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

menubutton: dismiss menu/popover when toggling programmatically

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=735545
This commit is contained in:
Paolo Borelli 2014-08-27 21:36:08 +02:00
parent 0144cb92ed
commit d94379183a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkmenubutton.c
View File

@ -408,23 +408,28 @@ gtk_menu_button_toggled (GtkToggleButton *button)
{
GtkMenuButton *menu_button = GTK_MENU_BUTTON (button);
GtkMenuButtonPrivate *priv = menu_button->priv;
gboolean active;
if (!gtk_toggle_button_get_active (button))
return;
active = gtk_toggle_button_get_active (button);
if (priv->menu)
{
if (!gtk_widget_get_visible (priv->menu))
{
if (active)
{
/* we get here only when the menu is activated by a key
* press, so that we can select the first menu item
*/
popup_menu (menu_button, NULL);
gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->menu), FALSE);
if (!gtk_widget_get_visible (priv->menu))
{
/* we get here only when the menu is activated by a key
* press, so that we can select the first menu item
*/
popup_menu (menu_button, NULL);
gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->menu), FALSE);
}
}
else
gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
}
else if (priv->popover)
gtk_widget_show (priv->popover);
gtk_widget_set_visible (priv->popover, active);
}
static gboolean