summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-11-18 13:50:42 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-11-18 17:27:40 (GMT)
commit127164943f0783a4bb4d18834b5e002f08427e00 (patch)
treeb11ad352a9a3c2a1bebf00508442c0079537a9b8 /src/gui/kernel
parent1b259bccdc906b9f20935897f03e0c75d1358515 (diff)
downloadQt-127164943f0783a4bb4d18834b5e002f08427e00.zip
Qt-127164943f0783a4bb4d18834b5e002f08427e00.tar.gz
Qt-127164943f0783a4bb4d18834b5e002f08427e00.tar.bz2
Softkeymanager to not update sofkeys when native s60 dialog is shown
Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 22ac319..775d773 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -210,6 +210,10 @@ bool QSoftKeyManager::event(QEvent *e)
#ifdef Q_WS_S60
void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &softkeys)
{
+ // lets not update softkeys if s60 native dialog or menu is shown
+ if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog())
+ return;
+
CEikButtonGroupContainer* nativeContainer = S60->buttonGroupContainer();
nativeContainer->DrawableWindow()->SetOrdinalPosition(0);
nativeContainer->DrawableWindow()->SetPointerCapturePriority(1); //keep softkeys available in modal dialog