forked from enlightenment/efl
evas/evas_stack - just removed white spaces and fixed indentations
SVN revision: 64552
This commit is contained in:
parent
39d27f8cbb
commit
52a4c4bc7c
|
@ -8,13 +8,13 @@ evas_object_above_get_internal(const Evas_Object *obj)
|
||||||
return (Evas_Object *)((EINA_INLIST_GET(obj))->next);
|
return (Evas_Object *)((EINA_INLIST_GET(obj))->next);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ((EINA_INLIST_GET(((Evas_Object*)(obj))->layer))->next)
|
if ((EINA_INLIST_GET(((Evas_Object*)(obj))->layer))->next)
|
||||||
{
|
{
|
||||||
Evas_Layer *l;
|
Evas_Layer *l;
|
||||||
|
|
||||||
l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->next);
|
l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->next);
|
||||||
return l->objects;
|
return l->objects;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -27,12 +27,12 @@ evas_object_below_get_internal(const Evas_Object *obj)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev)
|
if ((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev)
|
||||||
{
|
{
|
||||||
Evas_Layer *l;
|
Evas_Layer *l;
|
||||||
|
|
||||||
l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev);
|
l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev);
|
||||||
return (Evas_Object *)((EINA_INLIST_GET((l->objects)))->last);
|
return (Evas_Object *)((EINA_INLIST_GET((l->objects)))->last);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -46,43 +46,43 @@ evas_object_raise(Evas_Object *obj)
|
||||||
if (evas_object_intercept_call_raise(obj)) return;
|
if (evas_object_intercept_call_raise(obj)) return;
|
||||||
if (!((EINA_INLIST_GET(obj))->next))
|
if (!((EINA_INLIST_GET(obj))->next))
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
evas_object_smart_member_raise(obj);
|
evas_object_smart_member_raise(obj);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (obj->in_layer)
|
if (obj->in_layer)
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_demote(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_demote(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj));
|
EINA_INLIST_GET(obj));
|
||||||
}
|
}
|
||||||
if (obj->clip.clipees)
|
if (obj->clip.clipees)
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
||||||
obj->restack = 1;
|
obj->restack = EINA_TRUE;
|
||||||
evas_object_change(obj);
|
evas_object_change(obj);
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
if (obj->layer->evas->events_frozen <= 0)
|
if (obj->layer->evas->events_frozen <= 0)
|
||||||
{
|
{
|
||||||
if (!evas_event_passes_through(obj))
|
if (!evas_event_passes_through(obj))
|
||||||
{
|
{
|
||||||
if (!obj->smart.smart)
|
if (!obj->smart.smart)
|
||||||
{
|
{
|
||||||
if (evas_object_is_in_output_rect(obj,
|
if (evas_object_is_in_output_rect(obj,
|
||||||
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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,43 +95,43 @@ evas_object_lower(Evas_Object *obj)
|
||||||
if (evas_object_intercept_call_lower(obj)) return;
|
if (evas_object_intercept_call_lower(obj)) return;
|
||||||
if (!((EINA_INLIST_GET(obj))->prev))
|
if (!((EINA_INLIST_GET(obj))->prev))
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
evas_object_smart_member_lower(obj);
|
evas_object_smart_member_lower(obj);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (obj->in_layer)
|
if (obj->in_layer)
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_promote(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_promote(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj));
|
EINA_INLIST_GET(obj));
|
||||||
}
|
}
|
||||||
if (obj->clip.clipees)
|
if (obj->clip.clipees)
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
||||||
obj->restack = 1;
|
obj->restack = EINA_TRUE;
|
||||||
evas_object_change(obj);
|
evas_object_change(obj);
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
if (obj->layer->evas->events_frozen <= 0)
|
if (obj->layer->evas->events_frozen <= 0)
|
||||||
{
|
{
|
||||||
if (!evas_event_passes_through(obj))
|
if (!evas_event_passes_through(obj))
|
||||||
{
|
{
|
||||||
if (!obj->smart.smart)
|
if (!obj->smart.smart)
|
||||||
{
|
{
|
||||||
if (evas_object_is_in_output_rect(obj,
|
if (evas_object_is_in_output_rect(obj,
|
||||||
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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,70 +148,70 @@ evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
|
||||||
if (evas_object_intercept_call_stack_above(obj, above)) return;
|
if (evas_object_intercept_call_stack_above(obj, above)) return;
|
||||||
if (!above)
|
if (!above)
|
||||||
{
|
{
|
||||||
evas_object_raise(obj);
|
evas_object_raise(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
|
if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
{
|
{
|
||||||
if (obj->smart.parent != above->smart.parent)
|
if (obj->smart.parent != above->smart.parent)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
|
ERR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
evas_object_smart_member_stack_above(obj, above);
|
evas_object_smart_member_stack_above(obj, above);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (above->smart.parent)
|
if (above->smart.parent)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_above(), %p stack above %p, but above has smart parent, obj does not", obj, above);
|
ERR("BITCH! evas_object_stack_above(), %p stack above %p, but above has smart parent, obj does not", obj, above);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer != above->layer)
|
if (obj->layer != above->layer)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_above(), %p stack above %p, not matching layers", obj, above);
|
ERR("BITCH! evas_object_stack_above(), %p stack above %p, not matching layers", obj, above);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->in_layer)
|
if (obj->in_layer)
|
||||||
{
|
{
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj));
|
EINA_INLIST_GET(obj));
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_append_relative(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_append_relative(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj),
|
EINA_INLIST_GET(obj),
|
||||||
EINA_INLIST_GET(above));
|
EINA_INLIST_GET(above));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (obj->clip.clipees)
|
if (obj->clip.clipees)
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
||||||
obj->restack = 1;
|
obj->restack = EINA_TRUE;
|
||||||
evas_object_change(obj);
|
evas_object_change(obj);
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
if (obj->layer->evas->events_frozen <= 0)
|
if (obj->layer->evas->events_frozen <= 0)
|
||||||
{
|
{
|
||||||
if (!evas_event_passes_through(obj))
|
if (!evas_event_passes_through(obj))
|
||||||
{
|
{
|
||||||
if (!obj->smart.smart)
|
if (!obj->smart.smart)
|
||||||
{
|
{
|
||||||
if (evas_object_is_in_output_rect(obj,
|
if (evas_object_is_in_output_rect(obj,
|
||||||
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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -228,70 +228,70 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
|
||||||
if (evas_object_intercept_call_stack_below(obj, below)) return;
|
if (evas_object_intercept_call_stack_below(obj, below)) return;
|
||||||
if (!below)
|
if (!below)
|
||||||
{
|
{
|
||||||
evas_object_lower(obj);
|
evas_object_lower(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
|
if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
{
|
{
|
||||||
if (obj->smart.parent != below->smart.parent)
|
if (obj->smart.parent != below->smart.parent)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
|
ERR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
evas_object_smart_member_stack_below(obj, below);
|
evas_object_smart_member_stack_below(obj, below);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (below->smart.parent)
|
if (below->smart.parent)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_below(), %p stack below %p, but below has smart parent, obj does not", obj, below);
|
ERR("BITCH! evas_object_stack_below(), %p stack below %p, but below has smart parent, obj does not", obj, below);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer != below->layer)
|
if (obj->layer != below->layer)
|
||||||
{
|
{
|
||||||
ERR("BITCH! evas_object_stack_below(), %p stack below %p, not matching layers", obj, below);
|
ERR("BITCH! evas_object_stack_below(), %p stack below %p, not matching layers", obj, below);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->in_layer)
|
if (obj->in_layer)
|
||||||
{
|
{
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj));
|
EINA_INLIST_GET(obj));
|
||||||
obj->layer->objects = (Evas_Object *)eina_inlist_prepend_relative(EINA_INLIST_GET(obj->layer->objects),
|
obj->layer->objects = (Evas_Object *)eina_inlist_prepend_relative(EINA_INLIST_GET(obj->layer->objects),
|
||||||
EINA_INLIST_GET(obj),
|
EINA_INLIST_GET(obj),
|
||||||
EINA_INLIST_GET(below));
|
EINA_INLIST_GET(below));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (obj->clip.clipees)
|
if (obj->clip.clipees)
|
||||||
{
|
{
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
if (obj->layer) evas_render_invalidate(obj->layer->evas);
|
||||||
obj->restack = 1;
|
obj->restack = EINA_TRUE;
|
||||||
evas_object_change(obj);
|
evas_object_change(obj);
|
||||||
evas_object_inform_call_restack(obj);
|
evas_object_inform_call_restack(obj);
|
||||||
if (obj->layer->evas->events_frozen <= 0)
|
if (obj->layer->evas->events_frozen <= 0)
|
||||||
{
|
{
|
||||||
if (!evas_event_passes_through(obj))
|
if (!evas_event_passes_through(obj))
|
||||||
{
|
{
|
||||||
if (!obj->smart.smart)
|
if (!obj->smart.smart)
|
||||||
{
|
{
|
||||||
if (evas_object_is_in_output_rect(obj,
|
if (evas_object_is_in_output_rect(obj,
|
||||||
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)
|
||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -303,19 +303,19 @@ evas_object_above_get(const Evas_Object *obj)
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
{
|
{
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
obj = (Evas_Object *)((EINA_INLIST_GET(obj))->next);
|
obj = (Evas_Object *)((EINA_INLIST_GET(obj))->next);
|
||||||
if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
|
if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
|
||||||
}
|
}
|
||||||
while (obj);
|
while (obj);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
obj = evas_object_above_get_internal(obj);
|
obj = evas_object_above_get_internal(obj);
|
||||||
while (obj)
|
while (obj)
|
||||||
{
|
{
|
||||||
if (!obj->delete_me) return (Evas_Object *)obj;
|
if (!obj->delete_me) return (Evas_Object *)obj;
|
||||||
obj = evas_object_above_get_internal(obj);
|
obj = evas_object_above_get_internal(obj);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -328,19 +328,19 @@ evas_object_below_get(const Evas_Object *obj)
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
if (obj->smart.parent)
|
if (obj->smart.parent)
|
||||||
{
|
{
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
obj = (Evas_Object *)((EINA_INLIST_GET(obj))->prev);
|
obj = (Evas_Object *)((EINA_INLIST_GET(obj))->prev);
|
||||||
if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
|
if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
|
||||||
}
|
}
|
||||||
while (obj);
|
while (obj);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
obj = evas_object_below_get_internal(obj);
|
obj = evas_object_below_get_internal(obj);
|
||||||
while (obj)
|
while (obj)
|
||||||
{
|
{
|
||||||
if (!obj->delete_me) return (Evas_Object *)obj;
|
if (!obj->delete_me) return (Evas_Object *)obj;
|
||||||
obj = evas_object_below_get_internal(obj);
|
obj = evas_object_below_get_internal(obj);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -355,14 +355,14 @@ evas_object_bottom_get(const Evas *e)
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
if (e->layers)
|
if (e->layers)
|
||||||
{
|
{
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
|
|
||||||
obj = e->layers->objects;
|
obj = e->layers->objects;
|
||||||
while (obj)
|
while (obj)
|
||||||
{
|
{
|
||||||
if (!obj->delete_me) return obj;
|
if (!obj->delete_me) return obj;
|
||||||
obj = evas_object_above_get_internal(obj);
|
obj = evas_object_above_get_internal(obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -392,8 +392,8 @@ evas_object_top_get(const Evas *e)
|
||||||
|
|
||||||
while (obj)
|
while (obj)
|
||||||
{
|
{
|
||||||
if (!obj->delete_me) return obj;
|
if (!obj->delete_me) return obj;
|
||||||
obj = evas_object_below_get_internal(obj);
|
obj = evas_object_below_get_internal(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
|
|
Loading…
Reference in New Issue