summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-08-12 09:48:00 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-08-12 09:51:55 (GMT)
commit031004dba57bff8eed8cdd0cd4c9ce44c9c36fd8 (patch)
treeec7e3262dcf1aa17defa3fc17ffb36463b1deee7
parente02769f81c0d7ca9585b2fd9ba58d901db513f8c (diff)
downloadQt-031004dba57bff8eed8cdd0cd4c9ce44c9c36fd8.zip
Qt-031004dba57bff8eed8cdd0cd4c9ce44c9c36fd8.tar.gz
Qt-031004dba57bff8eed8cdd0cd4c9ce44c9c36fd8.tar.bz2
Mouse move events delivered toa blocked widget.
On windows we were not checking whether the widgets receiving the mouse events are blocked by another modal widget or not. Task-number: 255912 Reviewed-by: Thierry Bastian
-rw-r--r--src/gui/kernel/qapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 086c042..fea3e2d 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2851,7 +2851,7 @@ QWidget *QApplicationPrivate::pickMouseReceiver(QWidget *candidate, const QPoint
QWidget *receiver = candidate;
if (!mouseGrabber)
- mouseGrabber = buttonDown ? buttonDown : alienWidget;
+ mouseGrabber = (buttonDown && !isBlockedByModal(buttonDown)) ? buttonDown : alienWidget;
if (mouseGrabber && mouseGrabber != candidate) {
receiver = mouseGrabber;