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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-25 12:02:24 +0300 (Fri, 25 May 2007)
New Revision: 11850

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

	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): really fix
	enter-notify on already selected menu items.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-25 08:57:46 UTC (rev 11849)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-25 09:02:24 UTC (rev 11850)
@@ -1,3 +1,8 @@
+2007-05-25  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): really fix
+	enter-notify on already selected menu items.
+
 2007-05-24  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): open submenus

Modified: projects/haf/trunk/gtk+/gtk/gtkmenushell.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-25 08:57:46 UTC (rev 11849)
+++ projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-25 09:02:24 UTC (rev 11850)
@@ -806,8 +806,7 @@
 	   !_gtk_menu_item_is_selectable (menu_item)))
 	return TRUE;
       
-      if ((menu_item->parent == widget) &&
-	  (menu_shell->active_menu_item != menu_item) &&
+      if (menu_item->parent == widget &&
 	  GTK_IS_MENU_ITEM (menu_item))
 	{
 	  if (menu_shell->ignore_enter)
@@ -826,7 +825,7 @@
                * entering a menu item where we wouldn't want to show
                * its submenu.
                */
-              if ((event->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON2_MASK)) &&
+              if ((event->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) &&
                   GTK_MENU_ITEM (menu_item)->submenu != NULL &&
                   !GTK_WIDGET_VISIBLE (GTK_MENU_ITEM (menu_item)->submenu))
                 {