Merge branch 'master' of git+ssh://git.enlightenment.org/apps/ephoto

This commit is contained in:
Stephen Houston 2016-05-29 10:33:50 -05:00
commit fda3f76926
1 changed files with 7 additions and 0 deletions

View File

@ -305,6 +305,10 @@ _mouse_out_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
Ephoto *ephoto = data;
ephoto->blocking = EINA_FALSE;
if (ephoto->overlay_timer)
ecore_timer_del(ephoto->overlay_timer);
ephoto->overlay_timer = ecore_timer_add(3.0, _timer_cb, ephoto);
}
static void
@ -313,6 +317,9 @@ _mouse_in_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
Ephoto *ephoto = data;
ephoto->blocking = EINA_TRUE;
ecore_timer_del(ephoto->overlay_timer);
ephoto->overlay_timer = NULL;
}
static void