diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-11-18 13:50:42 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-19 03:27:45 (GMT) |
| commit | 9b5db524d16def8e300f6e6f09c85ded1539ad01 (patch) | |
| tree | 19697e1996e1c63a56bb8c12e0faa178465a1b84 /src | |
| parent | 6e68ada53c6e061e1839354e2c917339853bcbac (diff) | |
| download | Qt-9b5db524d16def8e300f6e6f09c85ded1539ad01.zip Qt-9b5db524d16def8e300f6e6f09c85ded1539ad01.tar.gz Qt-9b5db524d16def8e300f6e6f09c85ded1539ad01.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
(cherry picked from commit 127164943f0783a4bb4d18834b5e002f08427e00)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 4 |
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 |