From 66f28829a17a8a7aa698cbd2f7ccfd26fa484325 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 8 Jan 2015 17:51:47 -0500 Subject: [PATCH] don't change shade.x/y during unshade or after shade fix T1930 --- src/bin/e_comp_object.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 93aa905a2..4c519f665 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1697,8 +1697,6 @@ _e_comp_smart_cb_shaded(void *data, Evas_Object *obj EINA_UNUSED, void *event_in if (!cw->ec) return; //NYI E_FREE_FUNC(cw->shade.anim, ecore_timer_del); - cw->shade.x = cw->x; - cw->shade.y = cw->y; e_comp_object_signal_emit(cw->smart_obj, "e,state,shaded", "e"); cw->shade.start = -100; cw->shade.dir = (E_Direction)event_info; @@ -1714,17 +1712,6 @@ _e_comp_smart_cb_unshading(void *data, Evas_Object *obj EINA_UNUSED, void *event E_FREE_FUNC(cw->shade.anim, ecore_timer_del); cw->shade.dir = (E_Direction)event_info; - if (cw->shade.dir == E_DIRECTION_UP || - cw->shade.dir == E_DIRECTION_LEFT) - { - cw->shade.x = cw->x; - cw->shade.y = cw->y; - } - else - { - cw->shade.x = cw->x - cw->w; - cw->shade.y = cw->y - cw->h; - } e_comp_object_signal_emit(cw->smart_obj, "e,state,unshading", "e"); cw->shade.start = ecore_loop_time_get(); cw->shade.anim = ecore_animator_add(_e_comp_object_shade_animator, cw);