Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c
Log Message:
Fix simultaneously fading windows.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ecompmgr.c 6 Sep 2005 22:36:26 -0000 1.56
+++ ecompmgr.c 6 Sep 2005 23:44:18 -0000 1.57
@@ -185,6 +185,7 @@
static void ECompMgrDamageAll(void);
static void ECompMgrHandleRootEvent(XEvent * ev, void *prm);
static void ECompMgrHandleWindowEvent(XEvent * ev, void *prm);
+static void doECompMgrWinFade(int val, void *data);
/*
* Visuals
@@ -997,6 +998,15 @@
}
static void
+ECompMgrWinFadeDoIn(EObj * eo, unsigned int op)
+{
+ char s[128];
+
+ Esnprintf(s, sizeof(s), "Fade-%#lx", eo->win);
+ DoIn(s, 1e-6 * Conf_compmgr.fading.dt_us, doECompMgrWinFade, op, eo);
+}
+
+static void
doECompMgrWinFade(int val, void *data)
{
EObj *eo = data;
@@ -1015,8 +1025,7 @@
{
if (op - cw->opacity > Conf_compmgr.fading.step)
{
- DoIn("Fade", 1e-6 * Conf_compmgr.fading.dt_us, doECompMgrWinFade,
- op, eo);
+ ECompMgrWinFadeDoIn(eo, op);
op = cw->opacity + Conf_compmgr.fading.step;
}
}
@@ -1024,14 +1033,13 @@
{
if (cw->opacity - op > Conf_compmgr.fading.step)
{
- DoIn("Fade", 1e-6 * Conf_compmgr.fading.dt_us, doECompMgrWinFade,
- op, eo);
+ ECompMgrWinFadeDoIn(eo, op);
op = cw->opacity - Conf_compmgr.fading.step;
}
}
#if 0
- Eprintf("doECompMgrWinFade %#x\n", op);
+ Eprintf("doECompMgrWinFade %#lx, %#x\n", eo->win, op);
#endif
ECompMgrWinChangeOpacity(eo, op);
}
@@ -1039,16 +1047,14 @@
static void
ECompMgrWinFadeIn(EObj * eo)
{
- DoIn("Fade", 1e-6 * Conf_compmgr.fading.dt_us, doECompMgrWinFade,
- eo->opacity, eo);
+ ECompMgrWinFadeDoIn(eo, eo->opacity);
ECompMgrWinChangeOpacity(eo, 0x10000000);
}
static void
ECompMgrWinFadeOut(EObj * eo)
{
- DoIn("Fade", 1e-6 * Conf_compmgr.fading.dt_us, doECompMgrWinFade,
- 0x10000000, eo);
+ ECompMgrWinFadeDoIn(eo, 0x10000000);
ECompMgrWinChangeOpacity(eo, eo->opacity);
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
