some toolbar menu fixes to go with r63756

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63760 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 5f72c7e..4962b68 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -410,6 +410,7 @@ static void
 _item_menu_create(Widget_Data *wd, Elm_Toolbar_Item *item)
 {
    item->o_menu = elm_menu_add(VIEW(item));
+   item->menu = EINA_TRUE;
    if (wd->menu_parent)
      elm_menu_parent_set(item->o_menu, wd->menu_parent);
    evas_object_event_callback_add(item->o_menu, EVAS_CALLBACK_HIDE,
@@ -426,6 +427,7 @@ _item_menu_destroy(Elm_Toolbar_Item *item)
         evas_object_del(item->o_menu);
         item->o_menu = NULL;
      }
+   item->menu = EINA_FALSE;
 }
 
 static int
@@ -1595,7 +1597,6 @@ elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu)
    if (!wd) return;
 
    if (item->menu == menu) return;
-   item->menu = menu;
    if (menu) _item_menu_create(wd, item);
    else _item_menu_destroy(item);
 }