From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 27 Jun 2012 14:15:42 +0000 (+0300)
Subject: Further fixes to widget masking
X-Git-Tag: 071012110112~185
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbb15b4612946851d7d81940a9cd6e3a3753c3f2;p=profile%2Fivi%2Fqtbase.git

Further fixes to widget masking

If mask was set to a widget before the widget was shown,
the mask was not applied.

Also, if toplevel widgets were set a mask in Windows, the mask was
applied to frame coordinates instead of client coordinates.

Ported relevant code from Qt4 to fix these issues.

Change-Id: Id6187cf4952b81b5b60c167e2fd284b7dc83ed9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index a7140a3..2b86113 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -1392,6 +1392,13 @@ void QWindowsWindow::setMask(const QRegion &region)
          return;
     }
     const HRGN winRegion = qRegionToWinRegion(region);
+
+    // Mask is in client area coordinates, so offset it in case we have a frame
+    if (window()->isTopLevel()) {
+        const QMargins margins = frameMargins();
+        OffsetRgn(winRegion, margins.left(), margins.top());
+    }
+
     // SetWindowRgn takes ownership.
     if (!SetWindowRgn(m_data.hwnd, winRegion, true))
         DeleteObject(winRegion);
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 25d79fa..c524491 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -151,6 +151,9 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     // Check children and create windows for them if necessary
     q_createNativeChildrenAndSetParent(q);
 
+    if (extra && !extra->mask.isEmpty())
+        setMask_sys(extra->mask);
+
     // If widget is already shown, set window visible, too
     if (q->isVisible())
         win->setVisible(true);