summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-04-18 00:10:39 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-04-18 00:10:39 +0200
commit830442bbe62f416b135760f0c0bf9e7ada6979c0 (patch)
tree39e13201c5417a603501a8254ca356b0e4a04502
parent338ed0ff00cf6f64da45143926ce1801bf9c26b1 (diff)
parent1a85ffb3f4fb0121096813a67ac7a82c297dacc2 (diff)
downloadberyl-premerge-830442bbe62f416b135760f0c0bf9e7ada6979c0.tar.gz
beryl-premerge-830442bbe62f416b135760f0c0bf9e7ada6979c0.tar.bz2
Merge branch 'master' of git+ssh://git.beryl-project.org/git/compiz/compiz-plugins-beryl-premerge
-rw-r--r--src/wall.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wall.c b/src/wall.c
index 9a04740..a147295 100644
--- a/src/wall.c
+++ b/src/wall.c
@@ -1923,7 +1923,7 @@ static void wallPaintTransformedScreen(CompScreen * s,
if (wallGetRotate(s->display))
{
- if (wallGetExpoAnimation(s->display) == ExpoAnimationZoom)
+ if (wallGetExpoAnimationIndex(s->display) == ExpoAnimationZoom)
rotation = 10.0 * sigmoidProgress(ws->expoCam);
else
rotation = 10.0 * ws->expoCam;
@@ -1962,7 +1962,7 @@ static void wallPaintTransformedScreen(CompScreen * s,
// rotate
matrixRotate(&sTransform, rotation, 0.0f, 1.0f, 0.0f);
- if (wallGetExpoAnimation(s->display) != ExpoAnimationZoom)
+ if (wallGetExpoAnimationIndex(s->display) != ExpoAnimationZoom)
{
// scale that all viewports fit the screen
float aspect = wallGetAspectRatio(s->display);
@@ -2124,7 +2124,7 @@ wallPaintWindow(CompWindow * w,
if (ws->expoActive)
{
- if (wallGetExpoAnimation(w->screen->display) != ExpoAnimationZoom)
+ if (wallGetExpoAnimationIndex(w->screen->display) != ExpoAnimationZoom)
pA.opacity = attrib->opacity * ws->expoCam;
if (w == ws->stickyWindow)
@@ -2132,7 +2132,7 @@ wallPaintWindow(CompWindow * w,
if (w->wmType & CompWindowTypeDockMask)
{
- if (wallGetExpoAnimation(w->screen->display) == ExpoAnimationZoom &&
+ if (wallGetExpoAnimationIndex(w->screen->display) == ExpoAnimationZoom &&
((w->screen->x == ws->origVX &&
w->screen->y == ws->origVY) ||
(w->screen->x == ws->rorigx &&
@@ -2169,7 +2169,7 @@ wallPaintWindow(CompWindow * w,
{
if (!(w == ws->stickyWindow))
{
- if (wallGetExpoAnimation(w->screen->display) == ExpoAnimationZoom)
+ if (wallGetExpoAnimationIndex(w->screen->display) == ExpoAnimationZoom)
pA.brightness = 0;
else
pA.brightness = attrib->brightness * (1 - sigmoidProgress(ws->expoCam));