[maemo-commits] [maemo-commits] r11818 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-24 17:36:13 +0300 (Thu, 24 May 2007)
New Revision: 11818

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenushell.c
Log:
2007-05-24  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): open submenus
	also if the menu item we're entering is already selected.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-24 14:26:40 UTC (rev 11817)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-24 14:36:13 UTC (rev 11818)
@@ -1,3 +1,8 @@
+2007-05-24  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): open submenus
+	also if the menu item we're entering is already selected.
+
 Wed May 23 18:17:18 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/gtkwidget.c: allow Maemo specific hooks after widget construction

Modified: projects/haf/trunk/gtk+/gtk/gtkmenushell.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-24 14:26:40 UTC (rev 11817)
+++ projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-24 14:36:13 UTC (rev 11818)
@@ -812,12 +812,12 @@
 	{
 	  if (menu_shell->ignore_enter)
 	    return TRUE;
-	  
-	  if ((event->detail != GDK_NOTIFY_INFERIOR) &&
-	      (GTK_WIDGET_STATE (menu_item) != GTK_STATE_PRELIGHT))
-	    {
-	      gtk_menu_shell_select_item (menu_shell, menu_item);
 
+	  if (event->detail != GDK_NOTIFY_INFERIOR)
+            {
+	      if (GTK_WIDGET_STATE (menu_item) != GTK_STATE_PRELIGHT)
+                gtk_menu_shell_select_item (menu_shell, menu_item);
+
               /* If any mouse button is down, and there is a submenu
                * that is not yet visible, activate it. It's sufficient
                * to check for any button's mask (not only the one