Fix bug where 'fade out' setting was always used for fading between opacities, even if we were actually fading in. Also committed to 3.5 branch.
svn path=/trunk/KDE/kdebase/workspace/; revision=528926
This commit is contained in:
parent
e3362f8e64
commit
86bd58b189
1 changed files with 10 additions and 1 deletions
|
@ -2878,7 +2878,16 @@ main (int argc, char **argv)
|
||||||
break;*/ /*skip if opacity does not change*/
|
break;*/ /*skip if opacity does not change*/
|
||||||
if (fadeTrans)
|
if (fadeTrans)
|
||||||
{
|
{
|
||||||
set_fade (dpy, w, w->opacity*1.0/OPAQUE, (tmp*1.0)/OPAQUE, fade_out_step, 0, False, True, True, False);
|
static double start, finish, step;
|
||||||
|
start = w->opacity*1.0/OPAQUE;
|
||||||
|
finish = (tmp*1.0)/OPAQUE;
|
||||||
|
|
||||||
|
if ( start > finish )
|
||||||
|
step = fade_out_step;
|
||||||
|
else
|
||||||
|
step = fade_in_step;
|
||||||
|
|
||||||
|
set_fade (dpy, w, start, finish, step, 0, False, True, True, False);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue