src/hbinput/inputwidgets/hbinputvkbwidget.cpp
changeset 28 b7da29130b0e
parent 23 e6ad4ef83b23
child 30 80e4d18b72f5
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -1249,17 +1249,18 @@
                 d->mFlickDirection = HbFlickDirectionDown;
                 emit flickEvent(d->mFlickDirection);
                 emit keypadCloseEventDetected(HbVkbCloseMethodCloseGesture);
-            } else if (gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
-                d->mFlickDirection = HbFlickDirectionUp;
-                emit flickEvent(d->mFlickDirection);
-                d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
-            } else {
+            } else if (gesture->sceneVerticalDirection() != QSwipeGesture::Up) {
                 d->mFlickDirection = (HbInputVkbWidget::HbFlickDirection)gesture->sceneHorizontalDirection();
                 // horizontal swipes
                 if (d->mFlickAnimation) {
                     animKeyboardChange();
                 }
                 emit flickEvent(d->mFlickDirection);
+                // If keyboard change is not animated, flick direction should
+                // be set to none immediately since otherwise it won't be changed
+                if (!d->mFlickAnimation) {
+                    d->mFlickDirection = HbFlickDirectionNone;
+                }
             }
         }
     } else if (HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {