forked from enlightenment/enlightenment
remove e_comp_util_evas_object_comp_get() usage
This commit is contained in:
parent
c8fcff8109
commit
dd5cf53542
|
@ -1632,18 +1632,16 @@ e_comp_client_redirect_toggle(E_Client *ec)
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
e_comp_util_object_is_above_nocomp(Evas_Object *obj)
|
e_comp_util_object_is_above_nocomp(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
E_Comp *comp;
|
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
int cl, ol;
|
int cl, ol;
|
||||||
|
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
|
||||||
if (!evas_object_visible_get(obj)) return EINA_FALSE;
|
if (!evas_object_visible_get(obj)) return EINA_FALSE;
|
||||||
comp = e_comp_util_evas_object_comp_get(obj);
|
if (!e_comp->nocomp_ec) return EINA_FALSE;
|
||||||
if (!comp->nocomp_ec) return EINA_FALSE;
|
cl = evas_object_layer_get(e_comp->nocomp_ec->frame);
|
||||||
cl = evas_object_layer_get(comp->nocomp_ec->frame);
|
|
||||||
ol = evas_object_layer_get(obj);
|
ol = evas_object_layer_get(obj);
|
||||||
if (cl > ol) return EINA_FALSE;
|
if (cl > ol) return EINA_FALSE;
|
||||||
o = evas_object_above_get(comp->nocomp_ec->frame);
|
o = evas_object_above_get(e_comp->nocomp_ec->frame);
|
||||||
if ((cl == ol) && (evas_object_layer_get(o) == cl))
|
if ((cl == ol) && (evas_object_layer_get(o) == cl))
|
||||||
{
|
{
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -292,7 +292,7 @@ e_syscon_hide(void)
|
||||||
E_FREE_FUNC(deftimer, ecore_timer_del);
|
E_FREE_FUNC(deftimer, ecore_timer_del);
|
||||||
eina_stringshare_replace(&do_defact, NULL);
|
eina_stringshare_replace(&do_defact, NULL);
|
||||||
E_FREE_LIST(handlers, ecore_event_handler_del);
|
E_FREE_LIST(handlers, ecore_event_handler_del);
|
||||||
e_comp_ungrab_input(e_comp_util_evas_object_comp_get(popup), 1, 1);
|
e_comp_ungrab_input(e_comp, 1, 1);
|
||||||
evas_object_hide(popup);
|
evas_object_hide(popup);
|
||||||
E_FREE_FUNC(popup, evas_object_del);
|
E_FREE_FUNC(popup, evas_object_del);
|
||||||
o_selected_flow = o_selected = o_flow_extra = o_flow_main = o_flow_secondary = NULL;
|
o_selected_flow = o_selected = o_flow_extra = o_flow_main = o_flow_secondary = NULL;
|
||||||
|
|
Loading…
Reference in New Issue