summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-08-17 08:46:16 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-08-17 08:46:16 (GMT)
commit5aef1b278488fb889e298ce858ae299b83edf5ed (patch)
treefe4f3ef24f626567251f454f94e49827f314a6fd
parentde12ff38f2be5362321aa8e79cfbfd9692e18ab0 (diff)
downloadQt-5aef1b278488fb889e298ce858ae299b83edf5ed.zip
Qt-5aef1b278488fb889e298ce858ae299b83edf5ed.tar.gz
Qt-5aef1b278488fb889e298ce858ae299b83edf5ed.tar.bz2
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
Handle CloseSoftwareInputPanel event in QCoeFepInputContext (i.e. notify the native side that SIP needs to be closed). Note that event is not consumed. Task-number: QTBUG-20033 Reviewed-by: Miikka Heikkinen
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index d0dda83..2202d3a 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -252,9 +252,6 @@ bool QCoeFepInputContext::needsInputPanel()
bool QCoeFepInputContext::filterEvent(const QEvent *event)
{
- // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
- // close when it discovers that the underlying widget does not have input capabilities.
-
if (!focusWidget())
return false;
@@ -318,6 +315,11 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
if (!needsInputPanel())
return false;
+ if (event->type() == QEvent::CloseSoftwareInputPanel) {
+ m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::EAknClosePenInputRequest);
+ return false;
+ }
+
if (event->type() == QEvent::RequestSoftwareInputPanel) {
// Only request virtual keyboard if it is not yet active or if this is the first time
// panel is requested for this application.