diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-06-20 07:14:01 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-06-20 07:14:01 (GMT) |
| commit | c1c277e4ff09bff4d5686f54e6a827c7a98e6cf8 (patch) | |
| tree | ad85e738f650f1eec571569b1c54939789d802fa /src | |
| parent | 76de421d46bf74a1d584b6b2e06c71955030ff41 (diff) | |
| parent | 70b9a3456eeed54315c5840dff3f2b7cafdcb840 (diff) | |
| download | Qt-c1c277e4ff09bff4d5686f54e6a827c7a98e6cf8.zip Qt-c1c277e4ff09bff4d5686f54e6a827c7a98e6cf8.tar.gz Qt-c1c277e4ff09bff4d5686f54e6a827c7a98e6cf8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 57893f9..8c9444b 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -193,11 +193,14 @@ void QSoftKeyManager::sendKeyEvent() void QSoftKeyManager::updateSoftKeys() { - if (QApplication::activeWindow()) { - QSoftKeyManager::instance()->d_func()->pendingUpdate = true; - QEvent *event = new QEvent(QEvent::UpdateSoftKeys); - QApplication::postEvent(QSoftKeyManager::instance(), event); - } +#ifdef Q_WS_S60 + // Do not adjust softkeys if application is not the topmost one + if (S60->wsSession().GetFocusWindowGroup() != S60->windowGroup().WindowGroupId()) + return; +#endif + 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) |