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

hide mouseover ibar menu after mouse has left 

T744
This commit is contained in:
Mike Blumenkrantz 2014-01-17 18:13:03 -05:00
parent 34988ff214
commit 92b65633a4
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/ibar/e_mod_main.c
View File

@ -131,6 +131,7 @@ static void _ibar_drop_position_update(Instance *inst, Evas_Coord x, Eva
static void _ibar_inst_cb_scroll(void *data);
static Eina_Bool _ibar_cb_config_icons(void *data, int ev_type, void *ev);
static Eina_Bool _ibar_cb_out_hide_delay(void *data);
static void _ibar_icon_menu_show(IBar_Icon *ic, Eina_Bool grab);
static void _ibar_icon_menu_hide(IBar_Icon *ic, Eina_Bool grab);
@ -1102,6 +1103,25 @@ _ibar_cb_icon_menu_img_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
evas_object_resize(ic->menu->comp_object, w, h);
}
static void
_ibar_icon_menu_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
IBar_Icon *ic = data;
E_FREE_FUNC(ic->hide_timer, ecore_timer_del);
}
static void
_ibar_icon_menu_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
IBar_Icon *ic = data;
if (ic->hide_timer)
ecore_timer_reset(ic->hide_timer);
else
ic->hide_timer = ecore_timer_add(1.0, _ibar_cb_out_hide_delay, ic);
}
static void
_ibar_icon_menu(IBar_Icon *ic, Eina_Bool grab)
{
@ -1175,6 +1195,12 @@ _ibar_icon_menu(IBar_Icon *ic, Eina_Bool grab)
edje_object_size_min_calc(o, &w, &h);
edje_extern_object_min_size_set(o, w, h);
if (!grab)
{
evas_object_event_callback_add(ic->menu->comp_object, EVAS_CALLBACK_MOUSE_IN, _ibar_icon_menu_mouse_in, ic);
evas_object_event_callback_add(ic->menu->comp_object, EVAS_CALLBACK_MOUSE_OUT, _ibar_icon_menu_mouse_out, ic);
}
ic->menu->w = w, ic->menu->h = h;
edje_object_signal_callback_add(o, "e,action,hide,done", "*",
_ibar_cb_icon_menu_hidden, ic);