diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-12-13 12:39:34 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-12-13 12:50:11 (GMT) |
| commit | d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa (patch) | |
| tree | a044f518aba60f5d778e8a9507332d8fed1ba102 /src/gui/kernel | |
| parent | 780b4d84205f16c46f6c5e85e6c1925beb4e4dba (diff) | |
| download | Qt-d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa.zip Qt-d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa.tar.gz Qt-d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa.tar.bz2 | |
Cocoa: popup hides behind window
Reason: when cocoa receives a mouse press/release in a window, it
finds the correct view inside that window and sends the mouse event
to it. But NSWindow also does some other stuff just before sending the
event, like raise and lower windows. So when we override sendEvent, and
more over, do not call [super sendEvent], we stop this raise/lower etc
from working. So, to make this work again, I partially revert change
0b2eab87ad3bd73a0744469a45c29ca098649c9b
Task-number: QTBUG-15638, QTBUG-1517
Reviewed-by: Fabien Freling
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index ddf1a27..1e2e71b 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -182,7 +182,7 @@ QT_END_NAMESPACE bool handled = false; // sometimes need to redirect mouse events to the popup. QWidget *popup = qAppInstance()->activePopupWidget(); - if (popup) { + if (popup && popup != widget) { switch([event type]) { case NSLeftMouseDown: |