summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Carr <racarr@gorbie.(none)>2007-04-24 09:40:44 -0400
committerRobert Carr <racarr@gorbie.(none)>2007-04-24 09:40:44 -0400
commit2c5cd61e51466a8815e952b1c529b2b91d94fccc (patch)
treebbf939d59639114a5066568b28349f66c690462b
parent382f1d199161a47f3f874f09f0688f3d975de816 (diff)
parente9f4307fffb9528f8b7427932fa53978594b2816 (diff)
downloadberyl-premerge-2c5cd61e51466a8815e952b1c529b2b91d94fccc.tar.gz
beryl-premerge-2c5cd61e51466a8815e952b1c529b2b91d94fccc.tar.bz2
Merge branch 'master' of git+ssh://racarr@git.beryl-project.org/git/compcomm/plugins/beryl-premerge
-rw-r--r--src/wall.c44
1 files changed, 1 insertions, 43 deletions
diff --git a/src/wall.c b/src/wall.c
index f3c975c..e1689e0 100644
--- a/src/wall.c
+++ b/src/wall.c
@@ -1670,46 +1670,6 @@ static Bool wallPaintScreen(CompScreen * s,
return status;
}
-static void moveWindowToViewportYPosition(CompWindow * w, int y, Bool sync)
-{
- int ty, vHeight = w->screen->height * w->screen->hsize;
-
- y += w->screen->y * w->screen->height;
- y = MOD(y, vHeight);
- y -= w->screen->y * w->screen->height;
-
- ty = y - w->attrib.y;
- if (ty)
- {
- int m, wy;
-
- if (!w->managed)
- return;
-
- if (w->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
- return;
-
- if (w->state & CompWindowStateStickyMask)
- return;
-
- m = w->attrib.y + ty;
- if (m - w->output.top < w->screen->height - vHeight)
- wy = ty + vHeight;
- else if (m + w->height + w->output.bottom > vHeight)
- wy = ty - vHeight;
- else
- wy = ty;
-
- if (w->saveMask & CWY)
- w->saveWc.y += wy;
-
- moveWindow(w, 0, wy, sync, TRUE);
-
- if (sync)
- syncWindowPosition(w);
- }
-}
-
static void wallGetDistanceForAnimation(CompScreen *s, double left, int output, float *rdx, float *rdy)
{
WALL_SCREEN(s);
@@ -1790,9 +1750,7 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
wallGetDistanceForAnimation(s, left, s->currentOutputDev, &dx, &dy);
moveWindow (w, ws->moveWindowX - w->attrib.x, ws->moveWindowY - w->attrib.y, TRUE, TRUE);
- moveWindowToViewportPosition(w, ws->moveWindowX - s->width*dx, FALSE);
- moveWindowToViewportYPosition(w, ws->moveWindowY - s->height*dy, FALSE);
- syncWindowPosition(w);
+ moveWindowToViewportPosition(w, ws->moveWindowX - s->width*dx, ws->moveWindowY - s->height*dy, TRUE);
}
}
}