yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'KDE/4.9'

Browse source
This commit is contained in:
Martin Gräßlin 2012-08-19 14:14:17 +02:00
commit 39de3f49f7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
effects/trackmouse/trackmouse.cpp
View file

@ -138,9 +138,12 @@ void TrackMouseEffect::paintScreen(int mask, QRegion region, ScreenPaintData& da
matrix.translate(p.x(), p.y(), 0.0); matrix.translate(p.x(), p.y(), 0.0);
matrix.rotate(i ? -2*m_angle : m_angle, 0, 0, 1.0); matrix.rotate(i ? -2*m_angle : m_angle, 0, 0, 1.0);
matrix.translate(-p.x(), -p.y(), 0.0); matrix.translate(-p.x(), -p.y(), 0.0);
if (shader) if (shader) {
shader->setUniform(GLShader::ModelViewMatrix, matrix); shader->setUniform(GLShader::ModelViewMatrix, matrix);
else shader->setUniform(GLShader::Saturation, 1.0);
shader->setUniform(GLShader::ModulationConstant, QVector4D(1.0, 1.0, 1.0, 1.0));
shader->setUniform(GLShader::AlphaToOne, 0);
} else
pushMatrix(matrix); pushMatrix(matrix);
m_texture[i]->bind(); m_texture[i]->bind();
m_texture[i]->render(region, m_lastRect[i]); m_texture[i]->render(region, m_lastRect[i]);