diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-06-09 11:08:32 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-06-09 11:15:32 (GMT) |
| commit | ee15568a59f56cd000fd30fe598a90acaee1c670 (patch) | |
| tree | 0d71331676afe2bd66dd8049b528debd075cb42c /src/gui/kernel/qwidget_win.cpp | |
| parent | bcba2d2d80758832e5abdfaa6baca872b81bb912 (diff) | |
| download | Qt-ee15568a59f56cd000fd30fe598a90acaee1c670.zip Qt-ee15568a59f56cd000fd30fe598a90acaee1c670.tar.gz Qt-ee15568a59f56cd000fd30fe598a90acaee1c670.tar.bz2 | |
Fix regression in popup behavior on Windows
Popups without a parent would unintentionally
deactivate their parents following af7d2b2127d.
In order to avoid this, we do not activate
popups when there is an active application window.
System tray popups are still activated.
Reviewed-by: denis
Task-number: QTBUG-11061
Diffstat (limited to 'src/gui/kernel/qwidget_win.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index a7e66bf..9d96fcb 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -1166,7 +1166,7 @@ void QWidgetPrivate::show_sys() // This is to resolve the problem where popups are opened from the // system tray and not being implicitly activated if (q->windowType() == Qt::Popup && - (!q->parentWidget() || !q->parentWidget()->isActiveWindow())) + !q->parentWidget() && !qApp->activeWindow()) q->activateWindow(); } |