elm_hover: remove focus_layer related code
Summary: because elm_hover implements Efl.Ui.Focus.Layer, focus_layer related code dosen't needed. Test Plan: elementary_test - hover Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5758
This commit is contained in:
parent
bd4e2a9e9d
commit
837a806b21
|
@ -653,20 +653,14 @@ _elm_hover_efl_gfx_size_set(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Eina_Size2
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd, Eina_Bool vis)
|
_elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED, Eina_Bool vis)
|
||||||
{
|
{
|
||||||
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
|
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
|
efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
|
||||||
|
|
||||||
if (vis)
|
if (vis) _hov_show_do(obj);
|
||||||
{
|
|
||||||
_hov_show_do(obj);
|
|
||||||
//we just set ourself as redirect in the next upper manager
|
|
||||||
pd->redirected = efl_ui_focus_object_focus_manager_get(pd->target);
|
|
||||||
efl_ui_focus_manager_redirect_set(pd->redirected, obj);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// for backward compatibility
|
// for backward compatibility
|
||||||
|
@ -674,9 +668,6 @@ _elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd, Eina_Bool vis)
|
||||||
|
|
||||||
if (!eina_streq(dismissstr, "on"))
|
if (!eina_streq(dismissstr, "on"))
|
||||||
_hide_signals_emit(obj);
|
_hide_signals_emit(obj);
|
||||||
|
|
||||||
efl_ui_focus_manager_redirect_set(pd->redirected, NULL);
|
|
||||||
pd->redirected = NULL;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -699,17 +690,13 @@ elm_hover_add(Evas_Object *parent)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eo *
|
EOLIAN static Eo *
|
||||||
_elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd)
|
_elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
||||||
|
|
||||||
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
|
|
||||||
|
|
||||||
efl_composite_attach(obj, pd->manager);
|
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,6 @@ struct _Elm_Hover_Data
|
||||||
sizeof(_content_aliases[0]) - 1];
|
sizeof(_content_aliases[0]) - 1];
|
||||||
|
|
||||||
Eina_Bool on_del : 1;
|
Eina_Bool on_del : 1;
|
||||||
Efl_Ui_Focus_Manager *manager;
|
|
||||||
Efl_Ui_Focus_Manager *redirected;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue