summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/miniview.c
diff options
context:
space:
mode:
authorracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-02 19:13:08 +0000
committerracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-02 19:13:08 +0000
commitd63695d5c0ee8d98e68fb876434e67bdb1481f2e (patch)
tree2c1d649bf8805e174188d94d4c89789e4aee2994 /beryl-plugins/src/miniview.c
parent0e042addb8f7c3c8797abd4389e62c7818e59322 (diff)
downloadmarex-dev-d63695d5c0ee8d98e68fb876434e67bdb1481f2e.tar.gz
marex-dev-d63695d5c0ee8d98e68fb876434e67bdb1481f2e.tar.bz2
Just teleport miniviews when moved until decent moving is added
git-svn-id: file:///beryl/trunk@3579 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/miniview.c')
-rw-r--r--beryl-plugins/src/miniview.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/beryl-plugins/src/miniview.c b/beryl-plugins/src/miniview.c
index 51c5536..0cf707c 100644
--- a/beryl-plugins/src/miniview.c
+++ b/beryl-plugins/src/miniview.c
@@ -113,7 +113,7 @@ static Bool miniviewMove(CompDisplay * d, CompAction * action,
MINIVIEW_SCREEN(s);
ms->miniX = d->pointerX;
ms->miniY = d->pointerY;
- ms->zCam = 0;
+ //ms->zCam = 0;
ms->moveStep = 0;
damageScreen(s);
return FALSE;
@@ -163,9 +163,12 @@ static void miniviewPaintTransformedScreen(CompScreen * s,
compensation = ms->size - 2.0f;
compensation /= 2;
glTranslatef(-compensation,compensation,0);
+
+ if (ms->moveStep <= 0.95)
+ ms->moveStep += 0.05;
- glTranslatef(1/((float)s->outputDev[output].width/(float)ms->miniX)*-ms->zCam,
- -1/((float)s->outputDev[output].height/(float)ms->miniY)*-ms->zCam,
+ glTranslatef((1/((float)s->outputDev[output].width/(float)ms->miniX)*-ms->zCam),
+ (-1/((float)s->outputDev[output].height/(float)ms->miniY)*-ms->zCam),
0);
int move = 0;