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.
This commit is contained in:
parent
dda350e3b4
commit
6c25b38a1c
|
@ -4013,6 +4013,12 @@ elm_toolbar_icon_order_lookup_get(const Evas_Object *obj EINA_UNUSED)
|
||||||
return ELM_ICON_LOOKUP_FDO_THEME;
|
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
|
static Eina_Bool
|
||||||
_part_of_chain(Elm_Toolbar_Item_Data *pd)
|
_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))
|
if (_part_of_chain(it))
|
||||||
order = eina_list_append(order, EO_OBJ(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)
|
if (require_more_items)
|
||||||
|
|
Loading…
Reference in New Issue