forked from enlightenment/efl
evas: restore behavior of stack above and below when no rel is specified.
This will fix CID 1191907 and CID 1191906. @fix
This commit is contained in:
parent
48aca12d22
commit
e9bd738dc4
|
@ -133,14 +133,13 @@ _evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_above)
|
_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)
|
if (!eo_above)
|
||||||
{
|
{
|
||||||
evas_object_raise(eo_obj);
|
evas_object_raise(eo_obj);
|
||||||
return;
|
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);
|
Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EVAS_OBJ_CLASS);
|
||||||
if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
|
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
|
EOLIAN void
|
||||||
_evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_below)
|
_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)
|
if (!eo_below)
|
||||||
{
|
{
|
||||||
evas_object_lower(eo_obj);
|
evas_object_lower(eo_obj);
|
||||||
return;
|
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);
|
Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EVAS_OBJ_CLASS);
|
||||||
if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
|
if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue