evas: restore expected behavior for rejecting move with same coords
move the check to after the intercept where it was previously
ref 11b7cf6b72
fix T4749
This commit is contained in:
parent
9a10b83281
commit
e1e28ce320
|
@ -120,7 +120,6 @@ _evas_object_intercept_call(Evas_Object *eo_obj, Evas_Object_Intercept_Cb_Type c
|
||||||
}
|
}
|
||||||
i = va_arg(args, int);
|
i = va_arg(args, int);
|
||||||
j = va_arg(args, int);
|
j = va_arg(args, int);
|
||||||
if ((obj->cur->geometry.x == i) && (obj->cur->geometry.y == j)) goto end_block;
|
|
||||||
if (!obj->interceptors) goto end_noblock;
|
if (!obj->interceptors) goto end_noblock;
|
||||||
blocked = evas_object_intercept_call_move(eo_obj, obj, i, j);
|
blocked = evas_object_intercept_call_move(eo_obj, obj, i, j);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -814,6 +814,8 @@ _efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *
|
||||||
if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 1, x, y))
|
if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 1, x, y))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if ((obj->cur->geometry.x == x) && (obj->cur->geometry.y == y)) return;
|
||||||
|
|
||||||
Evas_Map *map;
|
Evas_Map *map;
|
||||||
map = (Evas_Map *) evas_object_map_get(eo_obj);
|
map = (Evas_Map *) evas_object_map_get(eo_obj);
|
||||||
if (map && map->move_sync.enabled)
|
if (map && map->move_sync.enabled)
|
||||||
|
|
Loading…
Reference in New Issue