diff options
| author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-10-22 13:32:36 +0300 |
|---|---|---|
| committer | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-10-22 13:32:36 +0300 |
| commit | 17408b948f18daf292b47c76d04fd0772f96ec96 (patch) | |
| tree | 6b15bcc8c82aa750e2415f8128b4b7eed1bcb49d | |
| parent | 960bba8e43752c29250cf30a11748a744dbba991 (diff) | |
put back the (-2,-2) workaround
| -rw-r--r-- | mcompositor/main.cpp | 9 | ||||
| -rw-r--r-- | src/mcompositemanager.cpp | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mcompositor/main.cpp b/mcompositor/main.cpp index adfd636..d8837b4 100644 --- a/mcompositor/main.cpp +++ b/mcompositor/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char *argv[]) view.setWindowFlags(Qt::X11BypassWindowManagerHint); view.setAttribute(Qt::WA_NoSystemBackground); #if QT_VERSION >= 0x040600 + view.move(-2, -2); view.setViewportUpdateMode(QGraphicsView::NoViewportUpdate); view.setOptimizationFlags(QGraphicsView::IndirectPainting); #endif @@ -52,10 +53,10 @@ int main(int argc, char *argv[]) view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); - view.setMinimumSize(QApplication::desktop()->width(), - QApplication::desktop()->height()); - view.setMaximumSize(QApplication::desktop()->width(), - QApplication::desktop()->height()); + view.setMinimumSize(QApplication::desktop()->width() + 2, + QApplication::desktop()->height() + 2); + view.setMaximumSize(QApplication::desktop()->width() + 2, + QApplication::desktop()->height() + 2); QGLFormat fmt; fmt.setSamples(0); diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index 6ab50b5..3f8fe57 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -778,6 +778,7 @@ void MCompositeManagerPrivate::prepare() overlay_mapped = false; // make sure we try to map it in startup XReparentWindow(QX11Info::display(), localwin, xoverlay, 0, 0); localwin_parent = xoverlay; + XMoveWindow(QX11Info::display(), localwin, -2, -2); XDamageQueryExtension(QX11Info::display(), &damage_event, &damage_error); @@ -3216,9 +3217,9 @@ void MCompositeManagerPrivate::showOverlayWindow(bool show) static XRectangle empty = {0, 0, 0, 0}, fs = {0, 0, ScreenOfDisplay(QX11Info::display(), - DefaultScreen(QX11Info::display()))->width, + DefaultScreen(QX11Info::display()))->width + 2, ScreenOfDisplay(QX11Info::display(), - DefaultScreen(QX11Info::display()))->height}; + DefaultScreen(QX11Info::display()))->height + 2}; if (!show && (overlay_mapped || first_call)) { scene()->views()[0]->setUpdatesEnabled(false); XShapeCombineRectangles(QX11Info::display(), xoverlay, |