From d8752a037bb8799895f33cc21a0206eca3b89350 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 17 Jun 2011 15:03:38 +0300 Subject: Revert "Opening taskswitcher, pushes application softkeys to top of switcher" This reverts commit 38d04b8cd5a26564945b833450a104fe82d97e14. The above commit was reverted as it caused regression, the problem described in task QTBUG-6115 was reintroduced. --- src/gui/kernel/qsoftkeymanager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 57893f9..1150601 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -193,11 +193,9 @@ 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); - } + 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) -- cgit v0.12 From 70b9a3456eeed54315c5840dff3f2b7cafdcb840 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 17 Jun 2011 16:24:38 +0300 Subject: 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 --- src/gui/kernel/qsoftkeymanager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 1150601..8c9444b 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); -- cgit v0.12 From 282cc3b4bcffb5960631c50e43f302a7e26f4ac7 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 20 Jun 2011 11:18:08 +0300 Subject: Fix build break in S60 5.0 environment Task-number: QTBUG-19225 Reviewed-by: Sami Merila --- src/gui/kernel/qsoftkeymanager.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 8c9444b..a866da3 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -48,9 +48,6 @@ #ifdef Q_WS_S60 #include "private/qsoftkeymanager_s60_p.h" -#endif - -#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) #include "private/qt_s60_p.h" #endif -- cgit v0.12