Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Always focus on mouse in, and only focus if we interract with the shelf.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- e_shelf.c 24 Nov 2007 12:31:15 -0000 1.83
+++ e_shelf.c 24 Nov 2007 12:35:20 -0000 1.84
@@ -1217,7 +1217,6 @@
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 @@
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 @@
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;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
