From ec74eaa30c2cd6ec4d6aa217187e25e36098dd92 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 27 Jan 2014 09:21:31 -0500 Subject: [PATCH] re-show pager popups if desk is changed during popup hide animation --- src/modules/pager/e_mod_main.c | 11 ++++++----- src/modules/pager16/e_mod_main.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 03ebcc931..3bf2646b6 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -1677,12 +1677,13 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even if ((pager_config->popup) && (!act_popup)) { if ((pp = _pager_popup_find(ev->desk->zone))) - ecore_timer_del(pp->timer); - else - pp = _pager_popup_new(ev->desk->zone, 0); - - if (pp) { + ecore_timer_reset(pp->timer); + evas_object_show(pp->popup); + } + else + { + pp = _pager_popup_new(ev->desk->zone, 0); pp->timer = ecore_timer_add(pager_config->popup_speed, _pager_popup_cb_timeout, pp); } diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index e36ace18b..ccb5547c7 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -933,12 +933,13 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even if ((pager_config->popup) && (!act_popup)) { if ((pp = _pager_popup_find(ev->desk->zone))) - ecore_timer_del(pp->timer); - else - pp = _pager_popup_new(ev->desk->zone, 0); - - if (pp) { + ecore_timer_reset(pp->timer); + evas_object_show(pp->popup); + } + else + { + pp = _pager_popup_new(ev->desk->zone, 0); pp->timer = ecore_timer_add(pager_config->popup_speed, _pager_popup_cb_timeout, pp); }