diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-11-07 11:03:16 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-11-07 11:03:16 -0500 |
| commit | e1e28ce32062d83b95620c854bbc8c70e48b305b (patch) | |
| tree | 01d07df774d0313abcfcd1b019fa3ab263799720 | |
| parent | 9a10b83281dac7b92204c4c076bd298195fe7282 (diff) | |
| download | efl-e1e28ce32062d83b95620c854bbc8c70e48b305b.tar.gz | |
evas: restore expected behavior for rejecting move with same coords
move the check to after the intercept where it was previously
ref 11b7cf6b728001dbcd42ce41d5ac2e129a835fd8
fix T4749
| -rw-r--r-- | src/lib/evas/canvas/evas_object_intercept.c | 1 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_main.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c index 7bca4a72bb..14668dfa0f 100644 --- a/src/lib/evas/canvas/evas_object_intercept.c +++ b/src/lib/evas/canvas/evas_object_intercept.c @@ -120,7 +120,6 @@ _evas_object_intercept_call(Evas_Object *eo_obj, Evas_Object_Intercept_Cb_Type c } i = 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; blocked = evas_object_intercept_call_move(eo_obj, obj, i, j); break; diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 76c3c2bf66..89621c6ecb 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -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)) return; + if ((obj->cur->geometry.x == x) && (obj->cur->geometry.y == y)) return; + Evas_Map *map; map = (Evas_Map *) evas_object_map_get(eo_obj); if (map && map->move_sync.enabled) |