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

Fix window decoration quads in OpenGL scene

Browse source 
The quads for the left and right window decorations were broken in
3b4d55837. The problem is only visible for window decorations with more
than one color.
This commit is contained in:
Julius Zint 2022-02-10 14:18:38 +01:00 committed by Vlad Zahorodnii
parent 97dde989c3
commit 43bcd57853
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/decorationitem.cpp
View file

@ -209,23 +209,28 @@ WindowQuad buildQuad(const QRect &partRect, const QPoint &textureOffset,
const int x1 = r.x() + r.width(); const int x1 = r.x() + r.width();
const int y1 = r.y() + r.height(); const int y1 = r.y() + r.height();
int u0 = textureOffset.x() + p;
int v0 = textureOffset.y() + p;
int u1 = textureOffset.x() + p + (r.width() * devicePixelRatio);
int v1 = textureOffset.y() + p + (r.height() * devicePixelRatio);
if (rotated) {
u0 = textureOffset.x() + p;
v0 = textureOffset.y() + p + (r.width() * devicePixelRatio);
u1 = textureOffset.x() + p + (r.height() * devicePixelRatio);
v1 = textureOffset.y() + p;
}
WindowQuad quad; WindowQuad quad;
quad[0] = WindowVertex(x0, y0, u0, v0); // Top-left if (rotated) {
quad[1] = WindowVertex(x1, y0, u1, v0); // Top-right const int u0 = textureOffset.y() + p;
quad[2] = WindowVertex(x1, y1, u1, v1); // Bottom-right const int v0 = textureOffset.x() + p;
quad[3] = WindowVertex(x0, y1, u0, v1); // Bottom-left const int u1 = textureOffset.y() + p + (r.width() * devicePixelRatio);
const int v1 = textureOffset.x() + p + (r.height() * devicePixelRatio);
quad[0] = WindowVertex(x0, y0, v0, u1); // Top-left
quad[1] = WindowVertex(x1, y0, v0, u0); // Top-right
quad[2] = WindowVertex(x1, y1, v1, u0); // Bottom-right
quad[3] = WindowVertex(x0, y1, v1, u1); // Bottom-left
} else {
const int u0 = textureOffset.x() + p;
const int v0 = textureOffset.y() + p;
const int u1 = textureOffset.x() + p + (r.width() * devicePixelRatio);
const int v1 = textureOffset.y() + p + (r.height() * devicePixelRatio);
quad[0] = WindowVertex(x0, y0, u0, v0); // Top-left
quad[1] = WindowVertex(x1, y0, u1, v0); // Top-right
quad[2] = WindowVertex(x1, y1, u1, v1); // Bottom-right
quad[3] = WindowVertex(x0, y1, u0, v1); // Bottom-left
}
return quad; return quad;
} }