diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-06 16:15:21 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-06 16:15:21 (GMT) |
| commit | 90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c (patch) | |
| tree | a7b3f64a958fdae3378417eac93d6fc7346e1d56 /src/gui/painting/qwindowsurface_x11.cpp | |
| parent | 28cdb974cce58111a19e8691f4dd929a5c9f74ea (diff) | |
| parent | 092c773b95b1f126d36ab7c918fb098ddad6cae3 (diff) | |
| download | Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.zip Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.tar.gz Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting/qwindowsurface_x11.cpp')
| -rw-r--r-- | src/gui/painting/qwindowsurface_x11.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp index 5e4433c..46c4c42 100644 --- a/src/gui/painting/qwindowsurface_x11.cpp +++ b/src/gui/painting/qwindowsurface_x11.cpp @@ -129,9 +129,12 @@ void QX11WindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint // qDebug() << "XSetClipRectangles"; // for (int i = 0; i < num; ++i) // qDebug() << ' ' << i << rects[i].x << rects[i].x << rects[i].y << rects[i].width << rects[i].height; - XSetClipRectangles(X11->display, gc, 0, 0, rects, num, YXBanded); + if (num != 1) + XSetClipRectangles(X11->display, gc, 0, 0, rects, num, YXBanded); XCopyArea(X11->display, d_ptr->device.handle(), widget->handle(), gc, br.x() + offset.x(), br.y() + offset.y(), br.width(), br.height(), wbr.x(), wbr.y()); + if (num != 1) + XSetClipMask(X11->display, gc, XNone); } void QX11WindowSurface::setGeometry(const QRect &rect) |