atspi: toolbar - fix cannot call select callback
authorShinwoo Kim <cinoo.kim@samsung.com>
Fri, 5 Aug 2016 07:17:13 +0000 (16:17 +0900)
committerShinwoo Kim <cinoo.kim@samsung.com>
Fri, 5 Aug 2016 07:17:13 +0000 (16:17 +0900)
There is a line to check select_mode in _item_select function.
The item selected(clicked) callback is called when the select_mode is ELM_OBJECT_SELECT_MODE_NONE.
The checking select_mode should be handled at one place.

src/lib/elementary/elm_toolbar.c

index 672cc7d..8ef0d4e 100644 (file)
@@ -4039,15 +4039,12 @@ EOLIAN Eina_Bool
 _elm_toolbar_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
 {
    Elm_Toolbar_Item_Data *item;
-   if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)
+   EINA_INLIST_FOREACH(pd->items, item)
      {
-        EINA_INLIST_FOREACH(pd->items, item)
+        if (child_index-- == 0)
           {
-             if (child_index-- == 0)
-               {
-                  elm_toolbar_item_selected_set(EO_OBJ(item), EINA_TRUE);
-                  return EINA_TRUE;
-               }
+             elm_toolbar_item_selected_set(EO_OBJ(item), EINA_TRUE);
+             return EINA_TRUE;
           }
      }
    return EINA_FALSE;