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.

diff --git a/ChangeLog b/ChangeLog
index 310c37aafcfed2a63f8f30f42b382ccb72e78021..0d0bcba309df16411894c4f3978684e192866898 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 310c37aafcfed2a63f8f30f42b382ccb72e78021..0d0bcba309df16411894c4f3978684e192866898 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 310c37aafcfed2a63f8f30f42b382ccb72e78021..0d0bcba309df16411894c4f3978684e192866898 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 310c37aafcfed2a63f8f30f42b382ccb72e78021..0d0bcba309df16411894c4f3978684e192866898 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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,

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index acbf562715035803298e27cb2203e013744f9544..b1f25ffedc8ebf767c07569ef650f07ac8b873d9 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -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)
        {

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index ebae498dea32f6ecd2c18af131f2eb810e95c726..a0e5f00debf6fb1222bad8e2d3618986ade950fd 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -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) &&