vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always focus on mouse in, and only focus if we interract with the shelf. 

SVN revision: 32857
This commit is contained in:
Sebastian Dransfeld 2007-11-24 12:35:20 +00:00
parent 306ea57a09
commit 378da822f8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_shelf.c
View File

@ -1217,7 +1217,6 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
E_Shelf *es;
es = data;
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
if (es->cfg->autohide_show_action) return 1;
if (type == E_EVENT_ZONE_EDGE_IN)
@ -1276,7 +1275,11 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
break;
}
if (show) e_shelf_toggle(es, 1);
if (show)
{
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
e_shelf_toggle(es, 1);
}
}
else if (type == ECORE_X_EVENT_MOUSE_IN)
{
@ -1284,9 +1287,12 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
ev = event;
/* If we are about to hide the shelf, interrupt on mouse in */
if ((ev->win == es->win) &&
((es->hide_animator) || (es->instant_timer)))
e_shelf_toggle(es, 1);
if (ev->win == es->win)
{
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
if ((es->hide_animator) || (es->instant_timer))
e_shelf_toggle(es, 1);
}
}
return 1;
}