Merge branch 'KDE/4.7'

This commit is contained in:
Martin Gräßlin 2011-07-03 12:36:54 +02:00
commit aa3f7a6f4e

View file

@ -118,9 +118,10 @@ void ScreenShotEffect::postPaintScreen()
m_lastScreenshot = QPixmap::fromImage(img); m_lastScreenshot = QPixmap::fromImage(img);
if (m_lastScreenshot.handle() == 0) { if (m_lastScreenshot.handle() == 0) {
Pixmap xpix = XCreatePixmap(display(), rootWindow(), m_lastScreenshot.width(), Pixmap xpix = XCreatePixmap(display(), rootWindow(), m_lastScreenshot.width(),
m_lastScreenshot.height(), XDefaultDepth(display(), QX11Info::appScreen())); m_lastScreenshot.height(), 32);
m_lastScreenshot = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared); m_lastScreenshot = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared);
QPainter p(&m_lastScreenshot); QPainter p(&m_lastScreenshot);
p.setCompositionMode(QPainter::CompositionMode_Source);
p.drawImage(QPoint(0, 0), img); p.drawImage(QPoint(0, 0), img);
} }
emit screenshotCreated(m_lastScreenshot.handle()); emit screenshotCreated(m_lastScreenshot.handle());