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

fix shelf autohiding when the mouse goes directly from a shelf into the window of a shitty toolkit which blocks X mouse movement events 

ticket #1884


SVN revision: 80343
This commit is contained in:
Mike Blumenkrantz 2012-12-06 11:03:32 +00:00
parent 19c402a743
commit f233e0d59d
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/e_shelf.c
View File

@ -449,6 +449,8 @@ e_shelf_toggle(E_Shelf *es, int show)
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
es->toggle = show;
if (es->autohide_timer) ecore_timer_del(es->autohide_timer);
es->autohide_timer = NULL;
if (es->locked) return;
es->interrupted = -1;
es->urgent_show = 0;
@ -1293,6 +1295,8 @@ _e_shelf_free(E_Shelf *es)
}
e_object_del(E_OBJECT(es->popup));
}
if (es->autohide_timer) ecore_timer_del(es->autohide_timer);
es->autohide_timer = NULL;
es->popup = NULL;
ev = E_NEW(E_Event_Shelf, 1);
@ -1831,6 +1835,21 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNU
}
}
static Eina_Bool
_e_shelf_cb_mouse_move_autohide_fuck_systray(E_Shelf *es)
{
int x, y;
Ecore_Event_Mouse_Move ev;
memset(&ev, 0, sizeof(Ecore_Event_Mouse_Move));
ecore_x_pointer_xy_get(es->zone->container->manager->root, &x, &y);
ev.root.x = x, ev.root.y = y;
_e_shelf_cb_mouse_in(es, ECORE_EVENT_MOUSE_MOVE, &ev);
if (es->autohide_timer) ecore_timer_del(es->autohide_timer);
es->autohide_timer = NULL;
return EINA_FALSE;
}
static Eina_Bool
_e_shelf_cb_mouse_in(void *data, int type, void *event)
{
@ -1953,6 +1972,13 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
(E_INSIDE(ev->root.x, ev->root.y, es->x - 2, es->y - 2, es->w + 4, es->h + 4)) ||
(E_INSIDE(ev->root.x, ev->root.y, es->x + 2, es->y + 2, es->w + 4, es->h + 4)))
);
if (inside && es->popup)
{
if (es->autohide_timer)
ecore_timer_reset(es->autohide_timer);
else
es->autohide_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es);
}
}
if (inside)
{

1
src/bin/e_shelf.h
View File

@ -37,6 +37,7 @@ struct _E_Shelf
int interrupted;
float instant_delay;
Ecore_Timer *instant_timer;
Ecore_Timer *autohide_timer;
Ecore_Timer *module_init_end_timer;
Eina_List *handlers;
Ecore_Event_Handler *autohide;