enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

clean up my earlier gadcon/menu idler work to be functional, thanks to jeffdameth for pointing it out 

SVN revision: 74786
This commit is contained in:
Mike Blumenkrantz 2012-08-02 07:20:51 +00:00
parent 793145f2aa
commit 031fc80e2f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_gadcon.c
View File

@ -5205,14 +5205,14 @@ _e_gadcon_custom_populate_idler(void *data __UNUSED__)
#endif
EINA_LIST_FREE(custom_populate_requests, gc)
{
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) break;
if (ecore_time_get() - loop >= ecore_animator_frametime_get()) break;
if (!gc->cf) continue;
e_gadcon_layout_freeze(gc->o_container);
EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
{
cc = eina_hash_find(providers, cf_gcc->name);
if (!cc) continue;
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get())
if (ecore_time_get() - loop >= ecore_animator_frametime_get())
{
e_gadcon_layout_thaw(gc->o_container);
goto out;
@ -5261,7 +5261,7 @@ _e_gadcon_provider_populate_idler(void *data __UNUSED__)
EINA_LIST_FOREACH(gadcons, l, gc)
EINA_LIST_FREE(gc->populate_requests, cc)
{
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get())
if (ecore_time_get() - loop >= ecore_animator_frametime_get())
{
more = EINA_TRUE;
goto out;

9
src/bin/e_menu.c
View File

@ -1170,9 +1170,9 @@ _e_menu_idler(E_Menu *m)
t = ecore_loop_time_get();
evas_event_freeze(m->evas);
e_box_freeze(m->container_object);
EINA_LIST_FOREACH(m->items, m->idler_pos, mi)
EINA_LIST_FOREACH(m->idler_pos, m->idler_pos, mi)
{
if (ecore_loop_time_get() - t >= 0.5 * ecore_animator_frametime_get())
if (ecore_time_get() - t >= 0.8 * ecore_animator_frametime_get())
break;
_e_menu_item_realize(mi);
}
@ -1627,7 +1627,7 @@ _e_menu_realize(E_Menu *m)
EINA_LIST_FOREACH(m->items, m->idler_pos, mi)
{
if (ecore_loop_time_get() - t >= 0.5 * ecore_animator_frametime_get())
if (ecore_time_get() - t >= 0.8 * ecore_animator_frametime_get())
break;
_e_menu_item_realize(mi);
}
@ -1878,6 +1878,9 @@ _e_menu_unrealize(E_Menu *m)
if (m->bg_object) evas_object_del(m->bg_object);
m->bg_object = NULL;
if (m->container_object) evas_object_del(m->container_object);
if (m->idler) ecore_idler_del(m->idler);
m->idler = NULL;
m->idler_pos = NULL;
m->container_object = NULL;
m->cur.visible = 0;
m->prev.visible = 0;