Open submenus on click. (#128968, Martin Jeppesen)

2004-11-24  Matthias Clasen  <mclasen@redhat.com>

	Open submenus on click.  (#128968, Martin Jeppesen)

	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
	activate items with submenus after the timeout, just select
	them.

	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
	submenus popup immediately on click, regardless of popup
	delay.
This commit is contained in:
Matthias Clasen 2004-11-24 05:32:40 +00:00 committed by Matthias Clasen
parent 25ee10fe5a
commit 6be4d66566
6 changed files with 58 additions and 7 deletions

View File

@ -1,3 +1,15 @@
2004-11-24 Matthias Clasen <mclasen@redhat.com>
Open submenus on click. (#128968, Martin Jeppesen)
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
activate items with submenus after the timeout, just select
them.
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
submenus popup immediately on click, regardless of popup
delay.
2004-11-23 Matthias Clasen <mclasen@redhat.com>
* configure.in: Rework confusing error message. (#151742,

View File

@ -1,3 +1,15 @@
2004-11-24 Matthias Clasen <mclasen@redhat.com>
Open submenus on click. (#128968, Martin Jeppesen)
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
activate items with submenus after the timeout, just select
them.
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
submenus popup immediately on click, regardless of popup
delay.
2004-11-23 Matthias Clasen <mclasen@redhat.com>
* configure.in: Rework confusing error message. (#151742,

View File

@ -1,3 +1,15 @@
2004-11-24 Matthias Clasen <mclasen@redhat.com>
Open submenus on click. (#128968, Martin Jeppesen)
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
activate items with submenus after the timeout, just select
them.
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
submenus popup immediately on click, regardless of popup
delay.
2004-11-23 Matthias Clasen <mclasen@redhat.com>
* configure.in: Rework confusing error message. (#151742,

View File

@ -1,3 +1,15 @@
2004-11-24 Matthias Clasen <mclasen@redhat.com>
Open submenus on click. (#128968, Martin Jeppesen)
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
activate items with submenus after the timeout, just select
them.
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Make
submenus popup immediately on click, regardless of popup
delay.
2004-11-23 Matthias Clasen <mclasen@redhat.com>
* configure.in: Rework confusing error message. (#151742,

View File

@ -843,9 +843,12 @@ gtk_real_menu_item_select (GtkItem *item)
gint popup_delay;
if (menu_item->timer)
g_source_remove (menu_item->timer);
popup_delay = get_popup_delay (menu_item);
{
g_source_remove (menu_item->timer);
popup_delay = 0;
}
else
popup_delay = get_popup_delay (menu_item);
if (popup_delay > 0)
{

View File

@ -508,10 +508,10 @@ gtk_menu_shell_button_release (GtkWidget *widget,
_gtk_menu_item_is_selectable (menu_item))
{
if (GTK_MENU_ITEM (menu_item)->submenu == NULL)
{
gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
return TRUE;
}
gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
else
gtk_menu_item_select (menu_item);
return TRUE;
}
else if (menu_item &&
!_gtk_menu_item_is_selectable (menu_item) &&