summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qwidget_qpa.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-06-27 14:02:00 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-27 14:43:00 +0200
commit2858d85281514a70a14ca3b930be6b1d29cf4c0a (patch)
treea337e1254528c040acf30ca13a0b9a01d7bc5231 /src/widgets/kernel/qwidget_qpa.cpp
parent20e2fd074a12e62f7d361c69602a473bb16f2b95 (diff)
Widgets: Apply masks to native windows only.
Do not go searching for a parent window handle in setMask_sys() as this causes for example MDI areas to set masks that show the child only. Fix breakage introduced by 8e280d1e187b09651c7036bd76272342d52ce401 . Change-Id: I57de41d16985ebc8d3fc81153a671f2e2807b1eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget_qpa.cpp')
-rw-r--r--src/widgets/kernel/qwidget_qpa.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 99769b2a9c..25d79fadb5 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -930,22 +930,14 @@ void QWidgetPrivate::registerDropSite(bool on)
Q_UNUSED(on);
}
-void QWidgetPrivate::setMask_sys(const QRegion &regionIn)
+void QWidgetPrivate::setMask_sys(const QRegion &region)
{
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowMasks)) {
qWarning("%s: Not supported on %s.", Q_FUNC_INFO, qPrintable(QGuiApplication::platformName()));
return;
}
Q_Q(QWidget);
- QRegion region = regionIn;
- QWindow *window = q->windowHandle();
- if (!window) {
- if (QWidget *nativeParent = q->nativeParentWidget()) {
- window = nativeParent->windowHandle();
- region.translate(q->mapTo(nativeParent, QPoint(0, 0)));
- }
- }
- if (window)
+ if (const QWindow *window = q->windowHandle())
if (QPlatformWindow *platformWindow = window->handle())
platformWindow->setMask(region);
}