[maemo-commits] [maemo-commits] r12664 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-07-05 15:17:07 +0300 (Thu, 05 Jul 2007)
New Revision: 12664

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2007-07-05  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-applications-menu.c (hd_applications_menu_has_focus):
	correctly check where the focus is in the menus to avoid keyboard
	navigation problems. Fixes NB#60958.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-05 12:08:11 UTC (rev 12663)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-05 12:17:07 UTC (rev 12664)
@@ -1,3 +1,9 @@
+2007-07-05  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-applications-menu.c (hd_applications_menu_has_focus):
+	correctly check where the focus is in the menus to avoid keyboard
+	navigation problems. Fixes NB#60958.
+
 2007-07-05  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-home-area.c:

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-05 12:08:11 UTC (rev 12663)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-05 12:17:07 UTC (rev 12664)
@@ -218,7 +218,7 @@
   {
     GtkWidget *item = (GtkWidget *) i->data;
 
-    if (GTK_WIDGET_HAS_FOCUS (item))
+    if (gtk_widget_is_focus (item))
       return TRUE;
   }
 
@@ -242,7 +242,7 @@
 			        HDApplicationsMenu *button)
 {
   HDWM *hdwm = hd_wm_get_singleton ();
-  
+
   if (event->keyval == GDK_Left    ||
       event->keyval == GDK_KP_Left ||
       event->keyval == GDK_Escape)
@@ -303,6 +303,10 @@
       
       return TRUE;
     }
+    else if (hd_applications_menu_has_focus (button->priv->menu_applications))
+    {
+      return gtk_widget_event (GTK_WIDGET (button->priv->menu_applications), (GdkEvent *) event);
+    }
   }
   else
   {