[maemo-commits] [maemo-commits] r13352 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-08-22 17:59:44 +0300 (Wed, 22 Aug 2007)
New Revision: 13352

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
Log:
cover menu items in hildon desktop custom menu widget

2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/sapwood-draw.c (maybe_check_submenu_state): cover menu items in
	hildon desktop custom menu widget (NB#60575)


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:41 UTC (rev 13351)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:44 UTC (rev 13352)
@@ -1,3 +1,8 @@
+2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/sapwood-draw.c (maybe_check_submenu_state): cover menu items in
+	hildon desktop custom menu widget (NB#60575)
+
 2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* src/sapwood-draw.c (draw_arrow): Ignore arrows of type none. (Patch

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:41 UTC (rev 13351)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:44 UTC (rev 13352)
@@ -786,6 +786,14 @@
       if (sub_item && GTK_WIDGET_STATE (sub_item) != GTK_STATE_NORMAL)
 	match_data->state = GTK_STATE_SELECTED;
     }
+
+  /* This is a hack to cover the cases where a menu item is being 
+   * used outside the usual a GtkMenu. More specificaly, this covers
+   * menu items inside the hildon-desktop custom menu widget. */
+  if (!GTK_IS_MENU (GTK_WIDGET (menu_item)->parent) &&
+      !gtk_widget_is_focus (GTK_WIDGET (menu_item)) &&
+      GTK_WIDGET_STATE (menu_item) != GTK_STATE_NORMAL)
+    match_data->state = GTK_STATE_SELECTED;
 }
 
 static void