diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-05-19 05:40:13 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-05-19 05:40:13 (GMT) |
| commit | 38d04b8cd5a26564945b833450a104fe82d97e14 (patch) | |
| tree | 954c1c9d6116660c8d304bca50e6daba30716360 | |
| parent | b8ff438747c620c6ed3d93c841d4f148f2087520 (diff) | |
| download | Qt-38d04b8cd5a26564945b833450a104fe82d97e14.zip Qt-38d04b8cd5a26564945b833450a104fe82d97e14.tar.gz Qt-38d04b8cd5a26564945b833450a104fe82d97e14.tar.bz2 | |
Opening taskswitcher, pushes application softkeys to top of switcher
If application does not have active window, do not update CBA, since
this causes the CBA to become on foreground.
Task-number: QTBUG-19225
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 204efe9..c51df9b 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -193,9 +193,11 @@ void QSoftKeyManager::sendKeyEvent() void QSoftKeyManager::updateSoftKeys() { - QSoftKeyManager::instance()->d_func()->pendingUpdate = true; - QEvent *event = new QEvent(QEvent::UpdateSoftKeys); - QApplication::postEvent(QSoftKeyManager::instance(), event); + if (QApplication::activeWindow()) { + QSoftKeyManager::instance()->d_func()->pendingUpdate = true; + QEvent *event = new QEvent(QEvent::UpdateSoftKeys); + QApplication::postEvent(QSoftKeyManager::instance(), event); + } } bool QSoftKeyManager::appendSoftkeys(const QWidget &source, int level) |