summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz.org>2011-09-03 10:59:01 +0200
committerDennis kasprzyk <onestone@compiz.org>2011-09-03 10:59:01 +0200
commite21ba0a32edd8143c6f46cdeb1d8471285fe9a98 (patch)
tree309c763f699b47619ccce5d2cb3057257310f654
parentb9aa1cb159a763546be7aaa0b0c1cbbdc49a9a12 (diff)
downloadkdecompat-e21ba0a32edd8143c6f46cdeb1d8471285fe9a98.tar.gz
kdecompat-e21ba0a32edd8143c6f46cdeb1d8471285fe9a98.tar.bz2
- Paint thumbnails above plasma info windowHEADmaster
- Fixed scale calculations
-rw-r--r--src/kdecompat.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/kdecompat.cpp b/src/kdecompat.cpp
index 5fb812c..78c0dc0 100644
--- a/src/kdecompat.cpp
+++ b/src/kdecompat.cpp
@@ -262,6 +262,9 @@ KDECompatWindow::glPaint (const GLWindowPaintAttrib &attrib,
glPopAttrib ();
glPopMatrix ();
}
+
+ if (!status)
+ status = gWindow->glPaint (attrib, transform, region, mask);
foreach (const Thumb& thumb, mPreviews)
{
@@ -284,8 +287,8 @@ KDECompatWindow::glPaint (const GLWindowPaintAttrib &attrib,
{
unsigned int width, height;
- width = tw->width () - tw->input ().left + tw->input ().right;
- height = tw->height () - tw->input ().top + tw->input ().bottom;
+ width = tw->width () + tw->input ().left + tw->input ().right;
+ height = tw->height () + tw->input ().top + tw->input ().bottom;
xScale = (float) rect.width () / width;
yScale = (float) rect.height () / height;
@@ -339,6 +342,7 @@ KDECompatWindow::glPaint (const GLWindowPaintAttrib &attrib,
if (!gtw->textures ().empty () || icon)
{
+
GLFragment::Attrib fragment (attrib);
GLMatrix wTransform (transform);
@@ -361,11 +365,10 @@ KDECompatWindow::glPaint (const GLWindowPaintAttrib &attrib,
gtw->glDrawTexture (icon, fragment, paintMask);
glPopMatrix ();
+
}
}
- if (!status)
- status = gWindow->glPaint (attrib, transform, region, mask);
return status;
}