diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-03-05 14:40:04 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-03-05 14:40:04 (GMT) |
| commit | 8428a5e9dbe8f872ba229aad360c8579638479ae (patch) | |
| tree | 375a02f52483999bcb65c513c4127b8d45349c59 /src/gui/kernel/qapplication_s60.cpp | |
| parent | 3d51d223bee55011876d12011970a5ad15c4acd0 (diff) | |
| download | Qt-8428a5e9dbe8f872ba229aad360c8579638479ae.zip Qt-8428a5e9dbe8f872ba229aad360c8579638479ae.tar.gz Qt-8428a5e9dbe8f872ba229aad360c8579638479ae.tar.bz2 | |
Fix for QTBUG-6659 Parent window accepts pointer events wrongly
Parent window accepted pointer events even though the child was modal.
That was because closing popup didn't restore pointer grab for modal
window.
Task-number: QTBUG-6659
Reviewed-by: axis
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 2a90ba6..395ceca 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1473,6 +1473,9 @@ void QApplicationPrivate::closePopup(QWidget *popup) QWidget *fw = QApplicationPrivate::active_window ? QApplicationPrivate::active_window->focusWidget() : q_func()->focusWidget(); if (fw) { + if(fw->window()->isModal()) // restore pointer capture for modal window + fw->effectiveWinId()->SetPointerCapture(true); + if (fw != q_func()->focusWidget()) { fw->setFocus(Qt::PopupFocusReason); } else { |