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

kwin: update the decoration texture although we dont paint the decoration

Browse source 
We have to update the texture because the next time client->decorationPixmapRequiresRepaint()
might return false.
This commit is contained in:
Philipp Knechtges 2011-07-06 17:13:41 +02:00
parent 976f396fc7
commit 8a9725a68b
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene_opengl.cpp
View file

@ -623,8 +623,6 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
void SceneOpenGL::Window::paintDecoration(const QPixmap* decoration, TextureType decorationType, const QRegion& region, const QRect& rect, const WindowPaintData& data, const WindowQuadList& quads, bool updateDeco) void SceneOpenGL::Window::paintDecoration(const QPixmap* decoration, TextureType decorationType, const QRegion& region, const QRect& rect, const WindowPaintData& data, const WindowQuadList& quads, bool updateDeco)
{ {
if (quads.isEmpty())
return;
SceneOpenGL::Texture* decorationTexture; SceneOpenGL::Texture* decorationTexture;
switch(decorationType) { switch(decorationType) {
case DecorationTop: case DecorationTop:
@ -653,6 +651,16 @@ void SceneOpenGL::Window::paintDecoration(const QPixmap* decoration, TextureType
} }
} else } else
return; return;
// We have to update the texture although we do not paint anything.
// This is especially needed if we draw the opaque part of the window
// and the decoration in two different passes (as we in Scene::paintSimpleWindow do).
// Otherwise we run into the situation that in the first pass there are some
// pending decoration repaints but we dont paint the decoration and in the
// second pass it's the other way around.
if (quads.isEmpty())
return;
if (filter == ImageFilterGood) if (filter == ImageFilterGood)
decorationTexture->setFilter(GL_LINEAR); decorationTexture->setFilter(GL_LINEAR);
else else