Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
fix the incorrectly placed parens. make sure the shelf always hides when the
mouse goes out of it. don't hide the shelf when mass editing the gadgets in it
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- e_shelf.c 24 Apr 2007 05:04:15 -0000 1.58
+++ e_shelf.c 27 Apr 2007 20:38:13 -0000 1.59
@@ -276,8 +276,7 @@
if (show)
{
-
- if (!es->hide_timer) es->hide_timer = ecore_timer_add(0.1,
_e_shelf_cb_hide_timer, es);
+ if (!es->hide_timer) es->hide_timer = ecore_timer_add(0.3,
_e_shelf_cb_hide_timer, es);
if ((es->hidden) && (!es->instant_timer))
{
@@ -295,7 +294,7 @@
}
}
}
- else if ((!show) && (es->cfg->autohide) && (!es->hidden))
+ else if ((!show) && (es->cfg->autohide) && (!es->hidden) &&
(!es->gadcon->editing))
{
es->hidden = 1;
edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
@@ -1040,9 +1039,15 @@
es = data;
if (es->gadcon->editing)
- e_gadcon_edit_end(es->gadcon);
+ {
+ e_gadcon_edit_end(es->gadcon);
+ e_shelf_toggle(es, 0);
+ }
else
- e_gadcon_edit_begin(es->gadcon);
+ {
+ e_shelf_toggle(es, 1);
+ e_gadcon_edit_begin(es->gadcon);
+ }
}
static void
@@ -1157,6 +1162,7 @@
es = data;
ev = event_info;
+ es->last_in = ecore_time_get();
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
e_shelf_toggle(es, 1);
}
@@ -1182,7 +1188,7 @@
if (es->popup)
ecore_x_pointer_xy_get(es->popup->evas_win, &px, &py);
else
- evas_pointer_canvas_xy_get(es->evas, &px, &py);
+ ecore_x_pointer_xy_get(es->zone->black_win, &px, &py);
if (E_INSIDE(px, py, x, y, w, h))
{
@@ -1191,7 +1197,7 @@
}
else
{
- if ((es->last_in) + (es->cfg->hide_timeout < ecore_time_get()))
+ if ((es->last_in + es->cfg->hide_timeout) < ecore_time_get())
{
e_shelf_toggle(es, 0);
if (es->hide_timer)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
