summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-04-27 14:17:47 +0200
committerDanny Baumann <dannybaumann@web.de>2007-04-27 14:17:47 +0200
commit44d3d50fcb0a67461a0b3e741e6a62ed8b6afdcf (patch)
tree6b7501add5ddc87c552d25f99ff1e9986b1e0bc6
parentcb041887eecd68d67a2193cde9cbfc05c8f79829 (diff)
downloadberyl-premerge-44d3d50fcb0a67461a0b3e741e6a62ed8b6afdcf.tar.gz
beryl-premerge-44d3d50fcb0a67461a0b3e741e6a62ed8b6afdcf.tar.bz2
Keep output device of switcher box constant during slide animation.
-rw-r--r--src/wall.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wall.c b/src/wall.c
index d14ee24..041bb93 100644
--- a/src/wall.c
+++ b/src/wall.c
@@ -146,6 +146,7 @@ typedef struct _WallScreen
Bool anyClick;
int boxTimeout;
+ int boxOutputDevice;
Window moveWindow;
@@ -660,6 +661,8 @@ static Bool wallMoveViewport(CompScreen * s, int x, int y, Window moveWindow)
ws->moving = TRUE;
ws->timer = (int)newTimeout - ws->timer;
+ ws->boxOutputDevice = s->currentOutputDev;
+
if (ws->moveWindow != moveWindow)
{
CompWindow *w;
@@ -1613,7 +1616,7 @@ static Bool wallPaintScreen(CompScreen * s,
}
if ((ws->moving || ws->boxTimeout) && wallGetShowSwitcher(s->display) &&
- (output == s->currentOutputDev))
+ (output == ws->boxOutputDevice))
{
wallDrawCairoTextureOnScreen(s, output, region);