diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-02-12 11:12:37 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-02-12 11:12:37 (GMT) |
| commit | 40bc32430551202ba519c4f0a95a341ea4547fb5 (patch) | |
| tree | f10bcf5728454657fb82e44ac4492bae55f7e705 /src/gui/kernel/qwidget.cpp | |
| parent | 9aaf834f9c31cb91cb7dd0693709e6754d836d85 (diff) | |
| download | Qt-40bc32430551202ba519c4f0a95a341ea4547fb5.zip Qt-40bc32430551202ba519c4f0a95a341ea4547fb5.tar.gz Qt-40bc32430551202ba519c4f0a95a341ea4547fb5.tar.bz2 | |
Fix to S60 softkeys when no active Qt window or native widget is shown.
Softkeys need to be updated also when Qt activewindow is set to NULL,
this is needed that usecase where last Qt widget is closed works
correctly. I.e. closed widget softkeys has to be removed, and replaced
by default "Exit" softkey. Earlier only window activation or widget
focusIn event caused softkey update.
In addition IsDisplayingMenuOrDialog does not work correctly under all
circumstances. Sometimes when menu is being launched the Qt gets
focusChanged event before the menu is actually shown, but menu CBA is
already created. This is fixed by checking that we update CBA only when
AppUi CB is the current one. This assumption works as long as Qt uses
only the CBA created by S60 application framwork and does not create
other CEikButtonGroupContainer instances.
Task-number: QTBUG-6115
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 2a19d23..850e961 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -8271,7 +8271,7 @@ bool QWidget::event(QEvent *event) } #ifdef QT_SOFTKEYS_ENABLED - if (isWindow() && isActiveWindow()) + if (isWindow()) QSoftKeyManager::updateSoftKeys(); #endif |