From 6c25b38a1c1d4a2df66a880a4093876f30c5829b Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 10 May 2018 13:25:43 +0200 Subject: [PATCH] elm_toolbar: only use the more_item if mode is correct the more item is only usefull for SHRINK_MENU and SHRINK_EXPAND, otherwise the item should not be there. --- src/lib/elementary/elm_toolbar.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 57e47e1f5a..54fd543525 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -4013,6 +4013,12 @@ elm_toolbar_icon_order_lookup_get(const Evas_Object *obj EINA_UNUSED) return ELM_ICON_LOOKUP_FDO_THEME; } +static Eina_Bool +_more_item_is_present(Elm_Toolbar_Data *pd) +{ + return pd->shrink_mode == ELM_TOOLBAR_SHRINK_MENU || pd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND; +} + static Eina_Bool _part_of_chain(Elm_Toolbar_Item_Data *pd) { @@ -4040,7 +4046,8 @@ _elm_toolbar_efl_ui_focus_composition_prepare(Eo *obj, Elm_Toolbar_Data *pd) { if (_part_of_chain(it)) order = eina_list_append(order, EO_OBJ(it)); - if (!it->prio.visible) require_more_items = EINA_TRUE; + if (_more_item_is_present(pd) && !it->prio.visible) + require_more_items = EINA_TRUE; } if (require_more_items)