summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-07-29 14:25:40 +0200
committerDanny Baumann <dannybaumann@web.de>2008-07-29 14:25:40 +0200
commit3921fdaeda0e13ede64b85424efc193873706809 (patch)
treec9f4e7d86e23de0c2bbc6390774b698019a3b8fc
parent75a20f821c742ce1be7f695e4af5b9cd3b9b8b7a (diff)
downloadfadedesktop-compiz-0.8.tar.gz
fadedesktop-compiz-0.8.tar.bz2
Track core changes.compiz-0.8
-rw-r--r--fadedesktop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fadedesktop.c b/fadedesktop.c
index 0f341d1..3336f74 100644
--- a/fadedesktop.c
+++ b/fadedesktop.c
@@ -154,7 +154,7 @@ fadeDesktopPreparePaintScreen(CompScreen *s, int msSinceLastPaint)
if (doFade)
{
- fw->opacity = w->opacity *
+ fw->opacity = w->paint.opacity *
(float)((fs->state == FD_STATE_OUT) ? fs->fadeTime :
fadedesktopGetFadetime(s) - fs->fadeTime) /
(float)fadedesktopGetFadetime(s);
@@ -260,7 +260,7 @@ static void fadeDesktopEnterShowDesktopMode(CompScreen *s)
fw->fading = TRUE;
w->inShowDesktopMode = TRUE;
- fw->opacity = w->opacity;
+ fw->opacity = w->paint.opacity;
}
}