remove invalid shelf autohide window check which would always be wrong
This commit is contained in:
parent
42f43c9311
commit
18120e1b5a
|
@ -1785,27 +1785,23 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
||||||
* mouse in/out events. in the future, when we remove systray, we should go
|
* mouse in/out events. in the future, when we remove systray, we should go
|
||||||
* back to mouse in/out events
|
* back to mouse in/out events
|
||||||
*/
|
*/
|
||||||
inside = (ev->event_window == e_comp_get(es)->win);
|
inside = E_INSIDE(e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.x),
|
||||||
if (!inside)
|
e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.y),
|
||||||
|
es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4);
|
||||||
|
x = e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.x) - es->zone->x;
|
||||||
|
y = e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.y) - es->zone->y;
|
||||||
|
if (inside)
|
||||||
|
inside = (
|
||||||
|
((E_INSIDE(x, y, es->x, es->y, es->w, es->h)) ||
|
||||||
|
(E_INSIDE(x, y, es->x - 2, es->y - 2, es->w + 4, es->h + 4)) ||
|
||||||
|
(E_INSIDE(x, y, es->x + 2, es->y + 2, es->w + 4, es->h + 4)))
|
||||||
|
);
|
||||||
|
if (inside)
|
||||||
{
|
{
|
||||||
inside = E_INSIDE(e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.x),
|
if (es->autohide_timer)
|
||||||
e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.y),
|
ecore_timer_reset(es->autohide_timer);
|
||||||
es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4);
|
else
|
||||||
x = e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.x) - es->zone->x;
|
es->autohide_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es);
|
||||||
y = e_comp_canvas_x_root_adjust(e_comp_get(es), ev->root.y) - es->zone->y;
|
|
||||||
if (inside)
|
|
||||||
inside = (
|
|
||||||
((E_INSIDE(x, y, es->x, es->y, es->w, es->h)) ||
|
|
||||||
(E_INSIDE(x, y, es->x - 2, es->y - 2, es->w + 4, es->h + 4)) ||
|
|
||||||
(E_INSIDE(x, y, es->x + 2, es->y + 2, es->w + 4, es->h + 4)))
|
|
||||||
);
|
|
||||||
if (inside)
|
|
||||||
{
|
|
||||||
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)
|
if (inside)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue