forked from enlightenment/enlightenment
simpler fix for systray/shelf hiding, also unbreaks autohide in cases which the previous commit just broke
SVN revision: 72784
This commit is contained in:
parent
80d70ec5dd
commit
712db1eb5a
|
@ -1488,15 +1488,12 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
|
|||
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
|
||||
e_shelf_toggle(es, 1);
|
||||
}
|
||||
else if (es->systrayed)
|
||||
else if (!es->hidden)
|
||||
{
|
||||
int x, y, w, h;
|
||||
evas_object_geometry_get(es->o_event, &x, &y, &w, &h);
|
||||
if (!E_INSIDE(ev->x, ev->y, x, y, w, h))
|
||||
{
|
||||
es->systrayed = EINA_FALSE;
|
||||
e_shelf_toggle(es, 0);
|
||||
}
|
||||
e_shelf_toggle(es, 0);
|
||||
}
|
||||
}
|
||||
else if (type == ECORE_EVENT_MOUSE_MOVE)
|
||||
|
@ -1545,7 +1542,6 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
|
|||
if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR)
|
||||
{
|
||||
//fprintf(stderr, "SYSTRAYED\n");
|
||||
es->systrayed = EINA_TRUE;
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ struct _E_Shelf
|
|||
unsigned char toggle : 1;
|
||||
unsigned char edge : 1;
|
||||
unsigned char urgent_show : 1;
|
||||
unsigned char systrayed : 1;
|
||||
unsigned int locked;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue