summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@XPS-FEDORA.(none)>2010-04-29 10:00:28 +0800
committerSam Spilsbury <smspillaz@XPS-FEDORA.(none)>2010-04-29 10:00:28 +0800
commitc29ff38fba433060f0df600219a62fc3668564e8 (patch)
tree6da9239341e8a2fe8c5366f3c6cebe027a1b144a
parent121ee991d99ffcc9b27d4159c592b97ee78393ac (diff)
parent32592c65b33a8628582870898913c3b70dde45c8 (diff)
downloadring-c29ff38fba433060f0df600219a62fc3668564e8.tar.gz
ring-c29ff38fba433060f0df600219a62fc3668564e8.tar.bz2
Merge branch 'master' of ssh://anongit.compiz.org/git/compiz/plugins/ring
-rw-r--r--src/ring.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ring.cpp b/src/ring.cpp
index d116394..c0ac8bd 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -384,16 +384,15 @@ RingWindow::glPaint (const GLWindowPaintAttrib &attrib,
CompRegion iconReg (window->x (), window->y (),
icon->width (), icon->height ());
- matrix = icon->matrix (); // ???
+ matrix = icon->matrix ();
matrix.x0 -= (window->x () * matrix.xx);
matrix.y0 -= (window->y () * matrix.yy);
matricies.push_back (matrix);
- gWindow->geometry ().vCount = 0;
- gWindow->geometry ().indexCount =0;
+ gWindow->geometry ().reset ();
- gWindow->glAddGeometry (matricies, iconReg, infiniteRegion); //???
+ gWindow->glAddGeometry (matricies, iconReg, iconReg);
if (gWindow->geometry ().vCount)
{