Remove ATK_STATE_SHOWING state when menuitem is not visible

When the menu is not selected, remove ATK_STATE_SHOWING state. And
emit state change signal if the menu is selected/unselected.

diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 2accc8389db5f34639bbd74fc61194e871b100be..173eace98cb737a5053fad0447302fe2db55aff5 100644 (file)
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -33,6 +33,7 @@ static void                  gail_menu_item_real_initialize
 static gint                  gail_menu_item_get_n_children (AtkObject      *obj);
 static AtkObject*            gail_menu_item_ref_child      (AtkObject      *obj,
                                                             gint           i);
+static AtkStateSet*          gail_menu_item_ref_state_set  (AtkObject      *obj);
 static void                  gail_menu_item_finalize       (GObject        *object);
 
 static void                  atk_action_interface_init     (AtkActionIface *iface);
@@ -73,6 +74,7 @@ gail_menu_item_class_init (GailMenuItemClass *klass)
 
   class->get_n_children = gail_menu_item_get_n_children;
   class->ref_child = gail_menu_item_ref_child;
+  class->ref_state_set = gail_menu_item_ref_state_set;
   class->initialize = gail_menu_item_real_initialize;
 }
 
@@ -239,6 +241,28 @@ gail_menu_item_ref_child (AtkObject *obj,
   return accessible;
 }
 
+static AtkStateSet*
+gail_menu_item_ref_state_set (AtkObject *obj)
+{
+  AtkObject *menu_item;
+  AtkStateSet *state_set, *parent_state_set;
+
+  state_set = ATK_OBJECT_CLASS (gail_menu_item_parent_class)->ref_state_set (obj);
+
+  menu_item = atk_object_get_parent (obj);
+
+  if (!GTK_IS_MENU_ITEM (GTK_ACCESSIBLE (menu_item)->widget))
+    return state_set;
+
+  parent_state_set = atk_object_ref_state_set (menu_item);
+  if (!atk_state_set_contains_state (parent_state_set, ATK_STATE_SELECTED))
+    {
+      atk_state_set_remove_state (state_set, ATK_STATE_FOCUSED);
+    }
+
+  return state_set;
+}
+
 static void
 atk_action_interface_init (AtkActionIface *iface)
 {
@@ -608,10 +632,18 @@ menu_item_selection (GtkItem  *item,
                      gboolean selected)
 {
   AtkObject *obj, *parent;
+  gint i;
 
   obj = gtk_widget_get_accessible (GTK_WIDGET (item));
   atk_object_notify_state_change (obj, ATK_STATE_SELECTED, selected);
- 
+
+  for (i = 0; i < atk_object_get_n_accessible_children (obj); i++)
+    {
+      AtkObject *child;
+      child = atk_object_ref_accessible_child (obj, i);
+      atk_object_notify_state_change (child, ATK_STATE_SHOWING, selected);
+      g_object_unref (child);
+    }
   parent = atk_object_get_parent (obj);
   g_signal_emit_by_name (parent, "selection_changed"); 
 }