diff options
| author | Ari Lehtola <ext-ari.lehtola@nokia.com> | 2011-11-29 08:08:05 (GMT) |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-30 14:00:26 (GMT) |
| commit | 9b40e102cc76666dfa76a7b0e3d1339d672d8a95 (patch) | |
| tree | f7e8aa76e41e1c24419eb66cd1652d491b76a6a7 /src/gui/kernel | |
| parent | 8752faf0564bed86396b01529dc8ef5064150f4c (diff) | |
| download | Qt-9b40e102cc76666dfa76a7b0e3d1339d672d8a95.zip Qt-9b40e102cc76666dfa76a7b0e3d1339d672d8a95.tar.gz Qt-9b40e102cc76666dfa76a7b0e3d1339d672d8a95.tar.bz2 | |
CBA comes on top of option menu
Layout has changed so that option menu starts from bottom of screen.
CBA is set behind in this case
Reviewed-by: Miikka Heikkinen
Task-number: ou1cimx1#932398
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index 999fccc..4d58baa 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -104,8 +104,13 @@ void QSoftKeyManagerPrivateS60::ensureCbaVisibilityAndResponsiviness(CEikButtonG { RDrawableWindow *cbaWindow = cba.DrawableWindow(); Q_ASSERT_X(cbaWindow, Q_FUNC_INFO, "Native CBA does not have window!"); - // Make sure CBA is visible, i.e. CBA window is on top - cbaWindow->SetOrdinalPosition(0); + // CBA comes on top of new option menu + int pos = 0; + + if(cba.ButtonGroupType()== SLafButtonGroupContainer::ECba) + pos = 1; + + cbaWindow->SetOrdinalPosition(pos); // Qt shares same CBA instance between top-level widgets, // make sure we are not faded by underlying window. cbaWindow->SetFaded(EFalse, RWindowTreeNode::EFadeIncludeChildren); |