avoid unnecessary comparisons from previous commit in some cases

SVN revision: 76317
This commit is contained in:
Mike Blumenkrantz 2012-09-07 18:21:29 +00:00
parent e841e2f920
commit 4e68cc3ceb
1 changed files with 6 additions and 4 deletions

View File

@ -1801,10 +1801,12 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
Eina_Bool inside = EINA_FALSE;
ev = event;
inside = (
(E_INSIDE(ev->root.x, ev->root.y, es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4)) &&
(E_INSIDE(ev->root.x, ev->root.y, es->x, es->y, es->w, es->h))
);
inside = (es->popup && ((ev->event_window == es->popup->evas_win)));
if (!inside)
inside = (
(E_INSIDE(ev->root.x, ev->root.y, es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4)) &&
(E_INSIDE(ev->root.x, ev->root.y, es->x, es->y, es->w, es->h))
);
if (inside)
{
if (es->hidden || (!es->toggle))