evas_layer.c - fixed indenation and removed white spaces
SVN revision: 60472
This commit is contained in:
parent
8a6f620675
commit
a76601e123
|
@ -12,9 +12,9 @@ evas_object_inject(Evas_Object *obj, Evas *e)
|
|||
lay = evas_layer_find(e, obj->cur.layer);
|
||||
if (!lay)
|
||||
{
|
||||
lay = evas_layer_new(e);
|
||||
lay->layer = obj->cur.layer;
|
||||
evas_layer_add(lay);
|
||||
lay = evas_layer_new(e);
|
||||
lay->layer = obj->cur.layer;
|
||||
evas_layer_add(lay);
|
||||
}
|
||||
lay->objects = (Evas_Object *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj));
|
||||
lay->usage++;
|
||||
|
@ -30,11 +30,11 @@ evas_object_release(Evas_Object *obj, int clean_layer)
|
|||
obj->layer->usage--;
|
||||
if (clean_layer)
|
||||
{
|
||||
if (obj->layer->usage <= 0)
|
||||
{
|
||||
evas_layer_del(obj->layer);
|
||||
_evas_layer_free(obj->layer);
|
||||
}
|
||||
if (obj->layer->usage <= 0)
|
||||
{
|
||||
evas_layer_del(obj->layer);
|
||||
_evas_layer_free(obj->layer);
|
||||
}
|
||||
}
|
||||
obj->layer = NULL;
|
||||
obj->in_layer = 0;
|
||||
|
@ -64,8 +64,8 @@ evas_layer_pre_free(Evas_Layer *lay)
|
|||
|
||||
EINA_INLIST_FOREACH(lay->objects, obj)
|
||||
{
|
||||
if ((!obj->smart.parent) && (!obj->delete_me))
|
||||
evas_object_del(obj);
|
||||
if ((!obj->smart.parent) && (!obj->delete_me))
|
||||
evas_object_del(obj);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -74,10 +74,10 @@ evas_layer_free_objects(Evas_Layer *lay)
|
|||
{
|
||||
while (lay->objects)
|
||||
{
|
||||
Evas_Object *obj;
|
||||
Evas_Object *obj;
|
||||
|
||||
obj = (Evas_Object *)lay->objects;
|
||||
evas_object_free(obj, 0);
|
||||
obj = (Evas_Object *)lay->objects;
|
||||
evas_object_free(obj, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,9 +88,9 @@ evas_layer_clean(Evas *e)
|
|||
|
||||
while (e->layers)
|
||||
{
|
||||
tmp = e->layers;
|
||||
evas_layer_del(tmp);
|
||||
_evas_layer_free(tmp);
|
||||
tmp = e->layers;
|
||||
evas_layer_del(tmp);
|
||||
_evas_layer_free(tmp);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ evas_layer_find(Evas *e, short layer_num)
|
|||
|
||||
EINA_INLIST_FOREACH(e->layers, layer)
|
||||
{
|
||||
if (layer->layer == layer_num) return layer;
|
||||
if (layer->layer == layer_num) return layer;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
@ -113,13 +113,13 @@ evas_layer_add(Evas_Layer *lay)
|
|||
|
||||
EINA_INLIST_FOREACH(lay->evas->layers, layer)
|
||||
{
|
||||
if (layer->layer > lay->layer)
|
||||
{
|
||||
lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers),
|
||||
EINA_INLIST_GET(lay),
|
||||
EINA_INLIST_GET(layer));
|
||||
return;
|
||||
}
|
||||
if (layer->layer > lay->layer)
|
||||
{
|
||||
lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers),
|
||||
EINA_INLIST_GET(lay),
|
||||
EINA_INLIST_GET(layer));
|
||||
return;
|
||||
}
|
||||
}
|
||||
lay->evas->layers = (Evas_Layer *)eina_inlist_append(EINA_INLIST_GET(lay->evas->layers), EINA_INLIST_GET(lay));
|
||||
}
|
||||
|
@ -148,8 +148,8 @@ evas_object_layer_set(Evas_Object *obj, short l)
|
|||
if (obj->smart.parent) return;
|
||||
if (obj->cur.layer == l)
|
||||
{
|
||||
evas_object_raise(obj);
|
||||
return;
|
||||
evas_object_raise(obj);
|
||||
return;
|
||||
}
|
||||
if (l < EVAS_LAYER_MIN) l = EVAS_LAYER_MIN;
|
||||
else if (l > EVAS_LAYER_MAX) l = EVAS_LAYER_MAX;
|
||||
|
@ -161,22 +161,22 @@ evas_object_layer_set(Evas_Object *obj, short l)
|
|||
evas_object_change(obj);
|
||||
if (obj->clip.clipees)
|
||||
{
|
||||
evas_object_inform_call_restack(obj);
|
||||
return;
|
||||
evas_object_inform_call_restack(obj);
|
||||
return;
|
||||
}
|
||||
evas_object_change(obj);
|
||||
if (!obj->smart.smart)
|
||||
{
|
||||
if (evas_object_is_in_output_rect(obj,
|
||||
obj->layer->evas->pointer.x,
|
||||
obj->layer->evas->pointer.y, 1, 1) &&
|
||||
obj->cur.visible)
|
||||
if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj))
|
||||
evas_event_feed_mouse_move(obj->layer->evas,
|
||||
obj->layer->evas->pointer.x,
|
||||
obj->layer->evas->pointer.y,
|
||||
obj->layer->evas->last_timestamp,
|
||||
NULL);
|
||||
if (evas_object_is_in_output_rect(obj,
|
||||
obj->layer->evas->pointer.x,
|
||||
obj->layer->evas->pointer.y, 1, 1) &&
|
||||
obj->cur.visible)
|
||||
if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj))
|
||||
evas_event_feed_mouse_move(obj->layer->evas,
|
||||
obj->layer->evas->pointer.x,
|
||||
obj->layer->evas->pointer.y,
|
||||
obj->layer->evas->last_timestamp,
|
||||
NULL);
|
||||
}
|
||||
evas_object_inform_call_restack(obj);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue