FCL/sf/mw/hb: comparison src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp

equal deleted inserted replaced

-:4633027730f5
+:e6ad4ef83b23
 int buttonId = keyEvent->key();
 if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
 // mode switch should happen only when Qt::Key_Asterisk key is pressed in non-SCT
 // keypad.
 if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
 !mInputMethod->isSctModeActive()) {
 //Remove the "?" mark if present
 if (!mCanContinuePrediction) {
 chopQMarkAndUpdateEditor();
 }
 mInputMethod->switchMode(buttonId);
 mLongPressHappened = true;
 } else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
 mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);
 mLongPressHappened = true;
 if (!mCanContinuePrediction) {
 deleteOneCharacter();
 mLongPressHappened = true;
 }
 // commit the first mapped number character when long key press
 // of character key received in alphanumeric mode
 if (buttonId != HbInputButton::ButtonKeyCodeDelete &&
 !mInputMethod->isSctModeActive()) {
 q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
 mLongPressHappened = true;
 }
 // since button is released we can set buttonDown back to false.
 mButtonDown = false;
 int buttonId = keyEvent->key();
-	// short key press of character keys should not be handled when "?" is displayed
+// short key press of character keys should not be handled when "?" is displayed
 if (!mCanContinuePrediction && !mLongPressHappened &&
-		buttonId >= Qt::Key_1 && buttonId <= Qt::Key_9) {
+buttonId >= Qt::Key_1 && buttonId <= Qt::Key_9) {
 return false;
 }
 // Sym key is handled in this class it self, so not passing it to
 // the base mode handlers.
 if (buttonId == HbInputButton::ButtonKeyCodeSymbol ||
 buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
 //Remove the "?" mark if present
 chopQMarkAndUpdateEditor();
 mInputMethod->switchMode(buttonId);
 - Should launch Candidate List if we can continue with prediction i.e. "?" is not displayed
 - Should launch Spell Query Dialog if we cannot continue with prediction
 - Behavior of Short Press of Asterisk Key when not in inline editing state
 - Should launch SCT
 - Behaviour of Short Press of Asterisk Key in SCT keypad
 - Should input the * character and should not change the keypad mode
 */
 else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
 !mInputMethod->isSctModeActive()) {
 if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
 //Remove the "?" mark
 (*mCandidates)[mBestGuessLocation].chop(1);
 updateEditor();
 q->launchSpellQueryDialog();
 } else {
 if (mShiftKeyDoubleTap) {
 mTimer->stop();
 mShiftKeyDoubleTap = false;
 //mShowTail = false;
 if (HbInputSettingProxy::instance()->globalInputLanguage()== mInputMethod->inputState().language()) {
 // in latin variants , double tap of shift key toggles the prediction status
 // revert back to the old case as this is a double tap
 // (the case was changed on the single tap)
 updateTextCase();
 q->togglePrediction();
 } else {
 }
 }
 }
 return true;
 }
-	// ButtonKeyCodeSettings should not be propagated to the engine
+// ButtonKeyCodeSettings should not be propagated to the engine
 if(buttonId == HbInputButton::ButtonKeyCodeSettings) {
 return true;
 }
 if (buttonId != HbInputButton::ButtonKeyCodeDelete &&
 buttonId != HbInputButton::ButtonKeyCodeEnter &&
 }
 // text input happens on button release
 if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
 return true;
 }
 return false;
 }
 void HbInputPrediction12KeyHandlerPrivate::cancelButtonPress()
 //any meaningful word for the input sequence.
 if(!d->mCanContinuePrediction) {
 int eventKey = event->key();
 switch(eventKey) {
 case Qt::Key_0:
+case HbInputButton::ButtonKeyCodeSettings:
 case HbInputButton::ButtonKeyCodeSpace: {
 if(d->mCandidates->size() && focusObject) {
 //Remove the "?" mark
 (*d->mCandidates)[d->mBestGuessLocation].chop(1);
 d->updateEditor();

changeset 23	e6ad4ef83b23
parent 21	4633027730f5
child 28	b7da29130b0e