From e9bd738dc4ec5e8906c8c15ba4176e099a21df74 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 13 Mar 2014 10:33:05 +0900 Subject: [PATCH] evas: restore behavior of stack above and below when no rel is specified. This will fix CID 1191907 and CID 1191906. @fix --- src/lib/evas/canvas/evas_stack.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index b5d1b635f0..e018db11d6 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -133,14 +133,13 @@ _evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) EOLIAN void _evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_above) { - if (!eo_above) return; - if (eo_obj == eo_above) return; - if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return; if (!eo_above) { evas_object_raise(eo_obj); return; } + if (eo_obj == eo_above) return; + if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return; Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EVAS_OBJ_CLASS); if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above)) { @@ -209,14 +208,13 @@ _evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Objec EOLIAN void _evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_below) { - if (!eo_below) return; - if (eo_obj == eo_below) return; - if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return; if (!eo_below) { evas_object_lower(eo_obj); return; } + if (eo_obj == eo_below) return; + if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return; Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EVAS_OBJ_CLASS); if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below)) {