enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

redo comp object util refs to be more consistent and not break evas

This commit is contained in:
Mike Blumenkrantz 2014-08-30 07:30:24 -04:00
parent 44545b53a9
commit 77c63e0387
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_comp_object.c
View File

@ -2183,7 +2183,11 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
evas_object_show(obj);
if (ref) evas_object_ref(obj);
if (ref)
{
evas_object_ref(obj);
evas_object_data_set(obj, "comp_ref", (void*)1);
}
edje_object_signal_emit(obj, "e,state,visible", "e");
evas_object_data_set(obj, "comp_showing", (void*)1);
if (e_comp_util_object_is_above_nocomp(obj))
@ -2199,7 +2203,11 @@ _e_comp_object_util_hide(void *data EINA_UNUSED, Evas_Object *obj)
if (!evas_object_visible_get(obj)) return;
/* already hiding */
if (evas_object_data_get(obj, "comp_hiding")) return;
evas_object_data_del(obj, "comp_showing");
if (!evas_object_data_del(obj, "comp_showing"))
{
evas_object_ref(obj);
evas_object_data_set(obj, "comp_ref", (void*)1);
}
edje_object_signal_emit(obj, "e,state,hidden", "e");
evas_object_data_set(obj, "comp_hiding", (void*)1);
@ -2217,10 +2225,11 @@ _e_comp_object_util_done_defer(void *data, Evas_Object *obj, const char *emissio
evas_object_hide(obj);
e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
evas_object_intercept_hide_callback_add(obj, _e_comp_object_util_hide, data);
evas_object_unref(obj);
}
else
evas_object_data_del(obj, "comp_showing");
if (evas_object_data_del(obj, "comp_ref"))
evas_object_unref(obj);
}
static void