diff options
| author | Satyam Bandarapu <ext-satyam.bandarapu@nokia.com> | 2012-02-08 11:25:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 12:45:36 +0100 |
| commit | 0ffd7fcc78e27f9184a6f1ee5a8a9cc5e6266998 (patch) | |
| tree | 028b87a9e392d05d896af3bd044d5baef74e5e27 /src/gui/s60framework/qs60mainappui.cpp | |
| parent | 60666017530dc981b3908e3e572269cb5a3019ed (diff) | |
Symbian: Fix for blank window after taping Editing options.
This happens in FlightInfo app when menu is opened, editor lost focus
and Fep manager looks for focused editor to do ccpu related tasks.
It also has some partially regression from fix
a2709ef3f4410a1d1755e00353e6f969f8bb5613. The regression is fixed in
QCoeFepInputContext::DocumentLengthForFep by returning size to 1 only
for multiline editors with no text and multiple lines presented.
And also set focused editor to last focused editor when Menu
is opened.
Opening EditOptions shows blank window if virtual keyboard is never
open before. This is because 'm_lastFocusedEditor' is null and it
will set to last focused editor only when virtual keyboard open.
Fixed in QCoeFepInputContext::setFocusWidget by setting
'm_lastFocusedEditor' to current editor.
Above fixes causes other issue, Qt application 'actions' are never
added to optionsMenu. This happens because Qt Symbian implementation
assumes that default menu items are less than or equal to one, but
in Qt 4.8.0 CCPU adds one more default menu item (EditOptoins) to
OptionsMenu in addition to 'Writing language' menu item. Fixed by
setting NumberOfItemsInPane<=2 in QS60MainAppUi::DynInitMenuPaneL.
Change-Id: Idd35cbc746f06f1c64d003c0a32ef1b8f8bc3c89
Reviewed-by: Sami Merilä <sami.merila@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Diffstat (limited to 'src/gui/s60framework/qs60mainappui.cpp')
| -rw-r--r-- | src/gui/s60framework/qs60mainappui.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index b88fe98301..787e94b4fb 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -258,7 +258,8 @@ void QS60MainAppUi::DynInitMenuPaneL(TInt resourceId, CEikMenuPane *menuPane) { #ifdef Q_WS_S60 if (resourceId == R_AVKON_MENUPANE_EMPTY) { - if (menuPane->NumberOfItemsInPane() <= 1) + // As ccpu is enabled in the editors, default native menu items are now <=2 + if (menuPane->NumberOfItemsInPane() <= 2) QT_TRYCATCH_LEAVING(qt_symbian_show_toplevel(menuPane)); } else if (resourceId != R_AVKON_MENUPANE_FEP_DEFAULT |