fix pager popup delete timer

T871
This commit is contained in:
Mike Blumenkrantz 2014-01-29 10:17:28 -05:00
parent 188aa7c4a0
commit 6523f283a6
2 changed files with 14 additions and 18 deletions

View File

@ -1677,16 +1677,14 @@ _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_reset(pp->timer);
evas_object_show(pp->popup);
}
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);
}
pp = _pager_popup_new(ev->desk->zone, 0);
if (pp->timer)
ecore_timer_reset(pp->timer);
else
pp->timer = ecore_timer_add(pager_config->popup_speed,
_pager_popup_cb_timeout, pp);
}
return ECORE_CALLBACK_PASS_ON;

View File

@ -933,16 +933,14 @@ _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_reset(pp->timer);
evas_object_show(pp->popup);
}
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);
}
pp = _pager_popup_new(ev->desk->zone, 0);
if (pp->timer)
ecore_timer_reset(pp->timer);
else
pp->timer = ecore_timer_add(pager_config->popup_speed,
_pager_popup_cb_timeout, pp);
}
return ECORE_CALLBACK_PASS_ON;