summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-06-17 16:24:38 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-06-17 16:24:38 +0300
commit70b9a3456eeed54315c5840dff3f2b7cafdcb840 (patch)
tree33f3e41f8949e5cf8c5103a2ff07209f82f235a1 /src/gui/kernel/qsoftkeymanager.cpp
parentd8752a037bb8799895f33cc21a0206eca3b89350 (diff)
Skip softkeys update if application is not on foreground in Symbian
Window deactivation in Qt applications when another application such as task switcher is opened on top of them caused softkeys to display incorrectly for the duration of Qt application being on the background. Task-number: QTBUG-19225 Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 11506012ac..8c9444b1be 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -193,6 +193,11 @@ void QSoftKeyManager::sendKeyEvent()
void QSoftKeyManager::updateSoftKeys()
{
+#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);