evas_layer.c | evas_layer.c | |||
---|---|---|---|---|
skipping to change at line 136 | skipping to change at line 136 | |||
void | void | |||
evas_layer_del(Evas_Layer *lay) | evas_layer_del(Evas_Layer *lay) | |||
{ | { | |||
Evas *e; | Evas *e; | |||
e = lay->evas; | e = lay->evas; | |||
e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay)); | e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay)); | |||
} | } | |||
static void | ||||
_evas_object_layer_set_child(Evas_Object *obj, Evas_Object *par, short l) | ||||
{ | ||||
if (obj->delete_me) return; | ||||
if (obj->cur.layer == l) return; | ||||
evas_object_release(obj, 1); | ||||
obj->cur.layer = l; | ||||
obj->layer = par->layer; | ||||
obj->layer->usage++; | ||||
if (obj->smart.smart) | ||||
{ | ||||
Eina_Inlist *contained; | ||||
Evas_Object *member; | ||||
contained = (Eina_Inlist *)evas_object_smart_members_get_direct(obj | ||||
); | ||||
EINA_INLIST_FOREACH(contained, member) | ||||
{ | ||||
_evas_object_layer_set_child(member, obj, l); | ||||
} | ||||
} | ||||
} | ||||
/* public functions */ | /* public functions */ | |||
EAPI void | EAPI void | |||
evas_object_layer_set(Evas_Object *obj, short l) | evas_object_layer_set(Evas_Object *obj, short l) | |||
{ | { | |||
Evas *e; | Evas *e; | |||
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | |||
return; | return; | |||
MAGIC_CHECK_END(); | MAGIC_CHECK_END(); | |||
skipping to change at line 179 | skipping to change at line 201 | |||
obj->layer->evas->pointer.x, | obj->layer->evas->pointer.x, | |||
obj->layer->evas->pointer.y, 1, 1 ) && | obj->layer->evas->pointer.y, 1, 1 ) && | |||
obj->cur.visible) | obj->cur.visible) | |||
if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj) ) | if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj) ) | |||
evas_event_feed_mouse_move(obj->layer->evas, | evas_event_feed_mouse_move(obj->layer->evas, | |||
obj->layer->evas->pointer.x, | obj->layer->evas->pointer.x, | |||
obj->layer->evas->pointer.y, | obj->layer->evas->pointer.y, | |||
obj->layer->evas->last_timestamp, | obj->layer->evas->last_timestamp, | |||
NULL); | NULL); | |||
} | } | |||
else | ||||
{ | ||||
Eina_Inlist *contained; | ||||
Evas_Object *member; | ||||
contained = (Eina_Inlist *)evas_object_smart_members_get_direct(obj | ||||
); | ||||
EINA_INLIST_FOREACH(contained, member) | ||||
{ | ||||
_evas_object_layer_set_child(member, obj, l); | ||||
} | ||||
} | ||||
evas_object_inform_call_restack(obj); | evas_object_inform_call_restack(obj); | |||
} | } | |||
EAPI short | EAPI short | |||
evas_object_layer_get(const Evas_Object *obj) | evas_object_layer_get(const Evas_Object *obj) | |||
{ | { | |||
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | |||
return 0; | return 0; | |||
MAGIC_CHECK_END(); | MAGIC_CHECK_END(); | |||
if (obj->smart.parent) | if (obj->smart.parent) | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 35 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |