Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c settings.c
Log Message:
Fix configuration of fade time.
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- ecompmgr.c 4 Feb 2007 04:22:30 -0000 1.136
+++ ecompmgr.c 4 Feb 2007 22:42:50 -0000 1.137
@@ -156,8 +156,7 @@
struct
{
char enable;
- int dt_us; /* us between updates */
- unsigned int step;
+ unsigned int time; /* Fading time, ms */
} fading;
struct
{
@@ -1209,7 +1208,7 @@
{
EObj *eo;
ECmWinInfo *cw;
- unsigned int op;
+ unsigned int op, step;
eo = (EObj *) data;
@@ -1229,6 +1228,10 @@
cw->fading = cw->fadeout;
+ step = Conf_compmgr.fading.time / Conf.animation.step;
+ if (step == 0)
+ step = 1;
+ step = 0xffffffff / step;
if (op == cw->opacity)
{
op = eo->opacity;
@@ -1236,17 +1239,17 @@
}
else if (op > cw->opacity)
{
- if (op - cw->opacity > Conf_compmgr.fading.step)
+ if (op - cw->opacity > step)
{
- op = cw->opacity + Conf_compmgr.fading.step;
+ op = cw->opacity + step;
cw->fading = 1;
}
}
else
{
- if (cw->opacity - op > Conf_compmgr.fading.step)
+ if (cw->opacity - op > step)
{
- op = cw->opacity - Conf_compmgr.fading.step;
+ op = cw->opacity - step;
cw->fading = 1;
}
}
@@ -2376,7 +2379,7 @@
cfg->enable = Conf_compmgr.enable;
cfg->shadow = Conf_compmgr.shadows.mode;
cfg->fading = Conf_compmgr.fading.enable;
- cfg->fade_speed = 100 - (Conf_compmgr.fading.dt_us / 1000);
+ cfg->fade_speed = 100 - (Conf_compmgr.fading.time / 10);
}
void
@@ -2416,7 +2419,7 @@
}
Conf_compmgr.fading.enable = cfg->fading;
- Conf_compmgr.fading.dt_us = (100 - cfg->fade_speed) * 1000;
+ Conf_compmgr.fading.time = (100 - cfg->fade_speed) * 10;
autosave();
}
@@ -2693,8 +2696,7 @@
CFG_ITEM_BOOL(Conf_compmgr, resize_fix_enable, 0),
CFG_ITEM_BOOL(Conf_compmgr, use_name_pixmap, 0),
CFG_ITEM_BOOL(Conf_compmgr, fading.enable, 1),
- CFG_ITEM_INT(Conf_compmgr, fading.dt_us, 10000),
- CFG_ITEM_HEX(Conf_compmgr, fading.step, 0x10000000),
+ CFG_ITEM_INT(Conf_compmgr, fading.time, 200),
CFG_ITEM_INT(Conf_compmgr, override_redirect.mode, 1),
CFG_ITEM_INT(Conf_compmgr, override_redirect.opacity, 90),
};
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- settings.c 17 Jan 2007 01:10:43 -0000 1.164
+++ settings.c 4 Feb 2007 22:42:50 -0000 1.165
@@ -601,7 +601,7 @@
DialogItemSetText(di, _("Fading Speed:"));
di = DialogAddItem(table, DITEM_SLIDER);
- DialogItemSliderSetBounds(di, 1, 100);
+ DialogItemSliderSetBounds(di, 0, 100);
DialogItemSliderSetUnits(di, 5);
DialogItemSliderSetJump(di, 5);
DialogItemSliderSetValPtr(di, &Cfg_composite.fade_speed);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
