Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c e_shelf.h
Log Message:
don't interrupt the shelf show animation, leaving out a half-shown shelf
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_shelf.c 7 May 2007 19:54:12 -0000 1.66
+++ e_shelf.c 10 May 2007 08:49:14 -0000 1.67
@@ -285,6 +285,7 @@
E_OBJECT_CHECK(es);
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
+ es->interrupted = -1;
if ((show) && (es->hidden))
{
es->hidden = 0;
@@ -306,10 +307,10 @@
}
else if ((!show) && (!es->hidden) && (!es->gadcon->editing) &&
(es->cfg->autohide))
{
- es->hidden = 1;
edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
if (es->instant_delay >= 0.0)
{
+ es->hidden = 1;
if (!es->instant_timer)
es->instant_timer = ecore_timer_add(es->instant_delay,
_e_shelf_cb_instant_hide_timer, es);
}
@@ -317,9 +318,10 @@
{
if (es->hide_animator)
{
- ecore_animator_del(es->hide_animator);
- es->hide_animator = NULL;
+ es->interrupted = show;
+ return;
}
+ es->hidden = 1;
if (es->hide_timer) ecore_timer_del(es->hide_timer);
es->hide_timer = ecore_timer_add(es->cfg->hide_timeout,
_e_shelf_cb_hide_animator_timer, es);
}
@@ -1385,7 +1387,10 @@
end:
es->hide_animator = NULL;
- _e_shelf_toggle_border_fix(es);
+ if (es->interrupted > -1)
+ e_shelf_toggle(es, es->interrupted);
+ else
+ _e_shelf_toggle_border_fix(es);
return 0;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_shelf.h 7 May 2007 19:16:51 -0000 1.23
+++ e_shelf.h 10 May 2007 08:49:14 -0000 1.24
@@ -39,6 +39,7 @@
int hide_step;
int hidden_state_size;
int hide_origin;
+ int interrupted;
float instant_delay;
Ecore_Timer *instant_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
