FCL/sf/mw/hb: comparison src/hbinput/inputwidgets/hbinputvkbwidget.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include <hbwidget.h>
 #include <hbdialog.h>
 #include <hbeffect.h>
 #include <hbframedrawer.h>
 #include <hbevent.h>
-#include <hbdataform.h>
 #include <hbinputregioncollector_p.h>
 #include <hbfeedbackmanager.h>
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputdef.h>
 #include <hbinputvkbhost.h>
 #include <hbinputvkbhostbridge.h>
-#include <hbinputsettingwidget.h>
 #include <hbinputcommondialogs.h>
 #include <hbinputkeymap.h>
 #include <hbinputkeymapfactory.h>
 #include <hbwidgetfeedback.h>
 #include <hbinputpredictionfactory.h>
 #include "hbinputsettinglist.h"
 #include "hbinputmodeindicator.h"
 #include "hbinputsmileypicker.h"
 #include "hbinputscreenshotwidget.h"
+#include "hbinputsettingpopup.h"
 const int HB_DIGIT_LATIN_START_VALUE          = 0x0030;
 const int HB_DIGIT_ARABIC_INDIC_START_VALUE   = 0x0660;
 const int HB_DIGIT_EASTERN_ARABIC_START_VALUE = 0x06F0;
 const int HB_DIGIT_DEVANAGARI_START_VALUE     = 0x0966;
 const qreal HbLandscapeSmileyPickerWidthInUnits = 83.4;
 const qreal HbSmileyPickerMarginInUnits = 0.9;
 /*!
-@proto
+@stable
 @hbinput
 \class HbInputVkbWidget
-\brief A base class for touch keypads.
+\brief The HbInputVkbWidget class is a base class for touch keypads.
 This class implements default mechanisms for opening and closing touch keypads.
-It know how to operate in landscape and in portait modes and it know how
+It supports landscape and portrait modes, and splitting the view into
-implement split view -mechasnism for S60 QT UI's Hb library. It also implements
+the application and touch keypad sections. It also implements a closing mechanism
-closing mechansim, where used is able to close the touch keypad by sliding it downwards
+where the user can close the touch keypad by swiping it downwards with a finger.
-with a finger. This class also implements background drawing for touch keypads.
+This class also implements background drawing for touch keypads.
 */
 /// @cond
 inline HbWidget *hbwidget_cast(QGraphicsItem *item)
 mMostRecentlyAccessedButton(0),
 mMostRecentlyClickedLocation(0.0, 0.0),
 mFocusedObject(0),
 mCurrentFocusedObject(0),
 mFlickAnimation(false),
-mSettingsListOpen(false),
+mSettingsDialogsOpen(0),
 mAnimateWhenDialogCloses(false),
 mKeyboardSize(HbQwerty4x10),
 mCloseHandleHeight(0),
 mCloseHandle(0),
-mSettingView(0),
-mCurrentView(0),
 mKeyboardDimmed(false),
-	  mSettingWidget(0)
+mSettingPopup(0)
 {
 mScreenshotTimeLine.setUpdateInterval(16);
 }
 q_ptr->mouseReleaseEvent(aEvent);
 }
 void HbInputVkbWidgetPrivate::applyEditorConstraints()
 {
-// no default implementaiton as of now.
+// no default implementation for now.
 }
 void HbInputVkbWidgetPrivate::updateKeyCodes()
 {
 Q_Q(HbInputVkbWidget);
 QRectF rect = QRectF(position.x(), position.y() + mCloseHandleHeight, q->boundingRect().width(), q->boundingRect().height() - mCloseHandleHeight);
 QTransform rotateTrans;
 rotateTrans = q->mainWindow()->viewportTransform();
 QRectF transRect = rotateTrans.mapRect(rect);
 QPixmap pixmap;
-pixmap = QPixmap::grabWidget(q->mainWindow(), (int)transRect.x(), (int)transRect.y(), (int)transRect.width(), (int)transRect.height());
+pixmap = QPixmap::grabWidget(q->mainWindow(), (int)transRect.x(), (int)transRect.y()+2, (int)transRect.width(), (int)transRect.height());
 pixmap = pixmap.transformed(rotateTrans.inverted());
+mScreenshotWidget->hide();
 mScreenshotWidget->setScreenshot(pixmap);
 }
 void HbInputVkbWidgetPrivate::updateMouseHitItem(HbTouchKeypadButton *button, QPointF position)
 Q_Q(HbInputVkbWidget);
 if (!descriptor.isEmpty() && mOwner) {
 // Set as active input method.
 HbInputSettingProxy::instance()->setPreferredInputMethod(q->mainWindow()->orientation(), descriptor, customData);
-// Activate immediately.
+if (HbInputSettingProxy::instance()->globalInputLanguage().language() == QLocale::Chinese &&
-mOwner->activateInputMethod(descriptor);
+q->mainWindow()->orientation() ==  Qt::Vertical) {
+HbInputLanguage primaryInputLanguage = HbInputSettingProxy::instance()->globalInputLanguage();
+mOwner->activateState(HbInputState(HbInputModeDefault,
+HbTextCaseAutomatic,
+HbKeyboardTouchPortrait,
+primaryInputLanguage));
+HbInputMethod::activeInputMethod()->activateInputMethod(descriptor);
+} else {
+// Activate immediately.
+mOwner->activateInputMethod(descriptor);
+}
 }
 }
 void HbInputVkbWidgetPrivate::_q_smileyPickerClosed()
 {
 HbInputFocusObject *focusObject = mOwner->focusObject();
 if (!focusObject) {
 return numChr;
 }
 HbInputLanguage language = mKeymap->language();
 if (language.language()  != (QLocale::Language)0) {
 HbInputDigitType digitType = HbInputUtils::inputDigitType(language);
 // In number editors, show the native digits only when both device and writing languages are same,
 }
 /// @endcond
 /*!
-Costructs the object.
+\enum HbInputVkbWidget::HbFlickDirection
+Describes the direction of the flick (swipe) gesture.
+*/
+/*!
+\var HbInputVkbWidget::HbFlickDirectionNone
+No direction for a flick gesture.
+*/
+/*!
+\var HbInputVkbWidget::HbFlickDirectionLeft
+Flick gesture to the left.
+*/
+/*!
+\var HbInputVkbWidget::HbFlickDirectionRight
+Flick gesture to the right.
+*/
+/*!
+\var HbInputVkbWidget::HbFlickDirectionUp
+Flick gesture upwards.
+*/
+/*!
+\var HbInputVkbWidget::HbFlickDirectionDown
+Flick gesture downwards.
+*/
+/*!
+\enum HbInputVkbWidget::HbVkbCloseMethod
+Describes the different closing methods for the virtual keyboard.
+*/
+/*!
+\var HbInputVkbWidget::HbVkbCloseMethodButtonDrag
+Keypad closed by dragging a button.
+*/
+/*!
+\var HbInputVkbWidget::HbVkbCloseMethodCloseButton
+Keypad closed with the close button.
+*/
+/*!
+\var HbInputVkbWidget::HbVkbCloseMethodCloseButtonDrag
+Keypad closed with a button.
+*/
+/*!
+\var HbInputVkbWidget::HbVkbCloseMethodCloseGesture
+Keypad closed with a downward flick (swipe) gesture.
+*/
+/*!
+\enum HbInputVkbWidget::HbSctView
+Defines the view mode for the special character view.
+*/
+/*!
+\var HbInputVkbWidget::HbSctViewSpecialCharacter
+View mode with the table of special characters.
+*/
+/*!
+\var HbInputVkbWidget::HbSctViewSmiley
+View mode with the table of smileys.
+*/
+/*!
+Constructor.
 */
 HbInputVkbWidget::HbInputVkbWidget(QGraphicsItem *parent)
 : HbWidget(*new HbInputVkbWidgetPrivate, parent)
 {
 Q_D(HbInputVkbWidget);
 d->mOwner = HbInputMethod::activeInputMethod();
 }
 }
 /*!
-Constructs the object.
+Constructor.
 */
 HbInputVkbWidget::HbInputVkbWidget(HbInputVkbWidgetPrivate &dd, QGraphicsItem *parent)
 : HbWidget(dd, parent)
 {
 Q_D(HbInputVkbWidget);
 #ifdef HB_EFFECTS
 HbEffect::disable(this);
 #endif // HB_EFFECTS
 setActive(false);
-}
+if (!d->mOwner) {
+d->mOwner = HbInputMethod::activeInputMethod();
-/*!
+}
-Destructs the object.
+}
+/*!
+Destructor.
 */
 HbInputVkbWidget::~HbInputVkbWidget()
 {
 }
 /*!
-Vkb host calls this handler when the keypad open animation finishes.
+The virtual keyboard host calls this handler when the keypad open animation has finished.
+\sa HbVkbHost
 */
 void HbInputVkbWidget::keyboardOpened(HbVkbHost *host)
 {
 Q_D(HbInputVkbWidget);
 d->mCurrentHost = host;
 d->mFlickDirection = HbFlickDirectionNone;
 }
 /*!
-Vkb host calls this handler when the keyboard close animation has finished.
+The virtual keyboard host calls this handler when the keyboard close animation has finished.
 \sa HbVkbHost
 */
 void HbInputVkbWidget::keyboardClosed(HbVkbHost *host)
 {
 d->mFlickDirection = HbFlickDirectionNone;
 }
 /*!
-Vkb host calls this handler when the keyboard minimize animation has finished.
+Draws the widget. Parameters \a option and \a widget are not used.
-\sa HbVkbHost
-*/
-void HbInputVkbWidget::keyboardMinimized(HbVkbHost *host)
-{
-Q_UNUSED(host);
-Q_D(HbInputVkbWidget);
-d->mFlickDirection = HbFlickDirectionNone;
-}
-/*!
-The paint method. Draws the widget.
 */
 void HbInputVkbWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
 Q_UNUSED(option);
 Q_UNUSED(widget);
 d->mIconDrawer->paint(painter, rect);
 painter->restore();
 }
 /*!
-Sets the content item which will fill the content area of this widget. Content item is
+Sets the content item that will fill the content area of this widget.
-a single input button group by default.
+The content item is a single input button group by default.
-If null is given then the old content item is deleted and content area is cleared.
+If \c null is given the old content item is deleted and the content area is cleared.
 Takes ownership of the given item.
-\sa updateKeyCodes
-\sa updateButtons
 \sa setKeyboardDimmed
 \sa probableKeypresses
 */
 void HbInputVkbWidget::setContentItem(QGraphicsLayoutItem *item)
 {
 d->mLayout->addItem(item);
 }
 }
 /*!
-Returns current content item or null if not set.
+Returns the current content item or \c null if not set.
 Ownership is not transferred.
 */
 QGraphicsLayoutItem *HbInputVkbWidget::contentItem() const
 {
 Q_D(const HbInputVkbWidget);
 }
 return item;
 }
 /*!
-\deprecated HbInputVkbWidget::setRockerVisible(bool)
+Returns the active keypad mode. Possible values are EModeAbc and EModeNumeric.
-is deprecated.
-Sets virtual rocker visibility.
-*/
-void HbInputVkbWidget::setRockerVisible(bool visible)
-{
-Q_UNUSED(visible);
-}
-/*!
-\deprecated HbInputVkbWidget::isRockerVisible() const
-is deprecated.
-Returns true if virtual rocker is allowed to be visible.
-*/
-bool HbInputVkbWidget::isRockerVisible() const
-{
-return false;
-}
-/*!
-Returns active keypad mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
 */
 HbKeypadMode HbInputVkbWidget::mode() const
 {
 Q_D(const HbInputVkbWidget);
 return d->mMode;
 }
 /*!
-Returns active keypad modifiers.
+Returns the active keypad modifiers as a set of flags for shift, chr, and fn keys
+(see details in file <tt>inputdef.h</tt>).
 */
 HbModifiers HbInputVkbWidget::modifiers() const
 {
 Q_D(const HbInputVkbWidget);
 return d->mModifiers;
 }
 /*!
-Sets the keypad to given mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
+Sets the keypad to given \a mode. Possible values are EModeAbc and EModeNumeric.
+\a modifiers is a set of flags for shift, chr, and fn keys (see details in file
+<tt>inputdef.h</tt>).
 */
 void HbInputVkbWidget::setMode(HbKeypadMode mode, HbModifiers modifiers)
 {
 Q_D(HbInputVkbWidget);
 d->mMode = mode;
 d->mInputModeIndicator->updateIndicator();
 }
 }
 /*!
-Sets key map data object. Given key map data will be used as a source for button titles.
+Sets the keymap data object. The given keymap data will be used as a source for button titles.
-Usually the key map data for active input language is used.
+Usually the keymap data for the active input language is used.
 */
 void HbInputVkbWidget::setKeymap(const HbKeymap *keymap)
 {
 Q_D(HbInputVkbWidget);
 if (keymap) {
 Q_D(HbInputVkbWidget);
 d->mCurrentHost = host;
 if (d->mSmileyPicker && d->mSmileyPicker->isVisible()) {
-d->mSmileyPicker->hide();
+d->mSmileyPicker->close();
 }
 if (d->mSettingList) {
 d->mSettingList->close();
 }
 }
 buttonGroup->setEnabled(!dimmed);
 }
 }
 /*!
-Shows settings list
+Shows the setting list.
 */
 void HbInputVkbWidget::showSettingList()
 {
 Q_D(HbInputVkbWidget);
 HbPredictionFactory *predFactory = HbPredictionFactory::instance();
-d->mSettingsListOpen = true;
+d->mSettingsDialogsOpen++;
 d->captureScreenshot();
 if (!d->mSettingList) {
 d->mSettingList = new HbInputSettingList();
 connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(showSettingsView()));
 } else {
 d->mSettingList->setLanguageSelectionEnabled(true);
 }
 if (focusObject->editorInterface().isPredictionAllowed() &&
-predFactory->predictionEngineForLanguage(HbInputSettingProxy::instance()->globalInputLanguage())) {
+predFactory->predictionEngineForLanguage(d->mOwner->inputState().language())) {
 d->mSettingList->setPredictionSelectionEnabled(true);
 } else {
 d->mSettingList->setPredictionSelectionEnabled(false);
 }
 }
 d->mSettingList->updateSettingList();
 d->mSettingList->open(this, SLOT(_q_settingsClosed(HbAction*)));
 }
 /*!
-Slot which is called when settings list is closed.
+This slot is called when the setting list is closed.
 */
 void HbInputVkbWidget::settingsClosed()
 {
 Q_D(HbInputVkbWidget);
 HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(contentItem());
 if (buttonGroup) {
 HbInputButton *item = buttonGroup->button(HbInputButton::ButtonKeyCodeSettings);
 if (item) {
 item->setState(HbInputButton::ButtonStateReleased);
 buttonGroup->setButton(item, HbInputButton::ButtonKeyCodeSettings);
 }
 }
+emit settingsListClosed();
-d->mSettingsListOpen = false;
+d->mSettingsDialogsOpen--;
-if (d->mAnimateWhenDialogCloses) {
+if (!d->mSettingsDialogsOpen){
-animKeyboardChange();
+if (d->mAnimateWhenDialogCloses) {
-d->mAnimateWhenDialogCloses = false;
+animKeyboardChange();
-} else if (d->mScreenshotTimeLine.state() != QTimeLine::Running) {
+d->mAnimateWhenDialogCloses = false;
-keypadLanguageChangeFinished();
+} else if (d->mScreenshotTimeLine.state() != QTimeLine::Running) {
-}
+keypadLanguageChangeFinished();
 }
+}
-/*!
+}
-Closes settings list
+/*!
+Closes the setting list.
 */
 void HbInputVkbWidget::closeSettingList()
 {
 Q_D(HbInputVkbWidget);
 d->mSettingList->close();
 }
 /*!
-Shows settings view
+Shows the Control Panel input settings content in a popup widget.
 */
 void HbInputVkbWidget::showSettingsView()
 {
 Q_D(HbInputVkbWidget);
-/*
+d->mSettingsDialogsOpen++;
-Added for vanilla input
-When settings dialog is launched, keypad is not closed.
-*/
-HbInputFocusObject *focusObject = 0;
-if (!d->mOwner || !(focusObject = d->mOwner->focusObject())) {
-return;
-}
-HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
-if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
-vkbHost->closeKeypad();
-}
-d->mCurrentFocusedObject = focusObject->object();
 closeSettingList();
-if(!d->mSettingView) {
-d->mSettingView = new HbView(this);
+d->mSettingPopup = new HbInputSettingPopup();
-HbAction *backAction = new HbAction(Hb::BackNaviAction, d->mSettingView);
-backAction->setText(tr("Back"));
+connect(d->mSettingPopup, SIGNAL(dialogClosed()), this, SLOT(closeSettingsView()));
-connect(backAction, SIGNAL(triggered(bool)), this, SLOT(closeSettingsView()));
+d->mSettingPopup->show();
-d->mSettingView->setNavigationAction(backAction);
+}
-HbDataForm *dataForm = new HbDataForm();
-d->mSettingView->setWidget(dataForm);
+/*!
-d->mSettingWidget = new HbInputSettingWidget(dataForm, d->mSettingView);
+Closes the input settings popup and returns to the previous view.
-}
-d->mSettingWidget->initializeWidget();
-HbInputRegionCollector::instance()->attach(d->mSettingView);
-d->mSettingView->setTitle(tr("Input Settings"));
-mainWindow()->addView(d->mSettingView);
-d->mCurrentView = mainWindow()->currentView();
-mainWindow()->setCurrentView(d->mSettingView);
-}
-/*!
-Closes settings view and returns to previous view
 */
 void HbInputVkbWidget::closeSettingsView()
 {
 Q_D(HbInputVkbWidget);
+d->mSettingPopup->deleteLater();
-mainWindow()->setCurrentView(d->mCurrentView);
+d->mSettingPopup = 0;
-mainWindow()->removeView(d->mSettingView);
+d->mSettingsDialogsOpen--;
-if (d->mSettingView->scene()) {
+if (!d->mSettingsDialogsOpen){
-d->mSettingView->scene()->removeItem(d->mSettingView);
+if (d->mAnimateWhenDialogCloses) {
-}
+animKeyboardChange();
-HbInputRegionCollector::instance()->detach(d->mSettingView);
+d->mAnimateWhenDialogCloses = false;
-d->mSettingWidget->resetWidget();
+} else if (d->mScreenshotTimeLine.state() != QTimeLine::Running) {
+keypadLanguageChangeFinished();
-if (d->mCurrentFocusedObject) {
+}
-HbInputFocusObject *focusObject = new HbInputFocusObject(d->mCurrentFocusedObject);
-d->mOwner->setFocusObject(focusObject);
-d->mCurrentFocusedObject = 0;
 }
 }
 /*!
 \deprecated HbInputVkbWidget::executeMethodDialog()
 return ret;
 }
 /*!
-\deprecated HbInputVkbWidget::rockerPosition()
+Sets the status of the background drawing. This method can be used to optimize
-is deprecated.
+virtual keyboard widget drawing. If it is known that the widget will cover
+the whole virtual keyboard area and there are no places where the background
-Returns the virtual rocker position. The default position is in the middle
+shows through, then the background drawing can be turned off to speed up
-of keypad button area.
+the paint() function.
-*/
-QPointF HbInputVkbWidget::rockerPosition()
-{
-return QPointF();
-}
-/*!
-Sets the status of the background drawing. This method can be used to
-optimize vkb widget drawing. If it is known that the widget will cover whole
-vkb area and there are no places where the background shows through, then the background
-drawing can be turned off to speed up paint method.
 */
 void HbInputVkbWidget::setBackgroundDrawing(bool backgroundEnabled)
 {
 Q_D(HbInputVkbWidget);
 d->mDrawbackground = backgroundEnabled;
 }
+/*!
-/*!
+Returns all the possible keys that the user could have intended to press
-Returns all possible keys that the user could have intended to press
+for the last registered touch along with their corresponding probabilities.
-for the last registered touch along with their corresponding probability.
 */
 QList<HbKeyPressProbability> HbInputVkbWidget::probableKeypresses()
 {
 QList<HbKeyPressProbability> probabilities;
 HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(contentItem());
 }
 return probabilities;
 }
 /*!
-Refines the bounding rect. This function is used for collision detection
+Returns the bounding area of the widget as a graphical shape,
-and hit test.
+which can be used for collision detection and hit test.
 */
 QPainterPath HbInputVkbWidget::shape() const
 {
 QRectF rect = boundingRect();
 QPainterPath path;
 path.addRect(rect);
 return path;
 }
 /*!
-\reimp
+Shows the smiley picker widget.
-*/
-QSizeF HbInputVkbWidget::minimizedKeyboardSize()
-{
-Q_D(HbInputVkbWidget);
-return QSizeF(0.0, d->mCloseHandleHeight);
-}
-/*!
-Shows smiley picker widget.
 */
 void HbInputVkbWidget::showSmileyPicker(int rows, int columns)
 {
 Q_D(HbInputVkbWidget);
 if (!d->mOwner || !d->mOwner->focusObject()) {
 // get the smiley list from editor interface smiley theme.
 QStringList smileys = focusObject->editorInterface().smileyTheme().smileys();
 if (!smileys.isEmpty()) {
 d->mSmileyPicker = new HbInputSmileyPicker(rows, columns, 0, smileys);
+// workaround start
+QEvent event(QEvent::Polish);
+QApplication::sendEvent(d->mSmileyPicker, &event);
+// workaround end
 d->mSmileyPicker->setObjectName("vkbwidget_smiley_picker");
 connect(d->mSmileyPicker, SIGNAL(selected(QString)), this, SIGNAL(smileySelected(QString)));
 }
 }
 buttonGroup->cancelButtonPress();
 }
 }
 }
+/*!
+Returns the direction of the flick (swipe) gesture.
+*/
 HbInputVkbWidget::HbFlickDirection HbInputVkbWidget::flickDirection()
 {
 Q_D(HbInputVkbWidget);
 return d->mFlickDirection;
 }
 /*!
-Sends key event to owning input method.
+Sends the key press event to the owning input method.
 */
 void HbInputVkbWidget::sendKeyPressEvent(const QKeyEvent &event)
 {
 Q_D(HbInputVkbWidget);
 d->mOwner->filterEvent(&event);
 }
 }
 /*!
-Sends key event to owning input method.
+Sends the key double-press event to the owning input method.
 */
 void HbInputVkbWidget::sendKeyDoublePressEvent(const QKeyEvent &event)
 {
 Q_D(HbInputVkbWidget);
 d->mOwner->filterEvent(&event);
 }
 }
 /*!
-Sends key event to owning input method.
+Sends the key release event to the owning input method.
 */
 void HbInputVkbWidget::sendKeyReleaseEvent(const QKeyEvent &event)
 {
 Q_D(HbInputVkbWidget);
 showSettingList();
 }
 }
 /*!
-Sends key event to owning input method.
+Sends the key long-press event to the owning input method.
 */
 void HbInputVkbWidget::sendLongPressEvent(const QKeyEvent &event)
 {
 Q_D(HbInputVkbWidget);
 d->mOwner->filterEvent(&event);
 }
 }
 /*!
-Sends key event to owning input method.
+Sends the key change event to the owning input method.
-Releae event is ignored.
+The release event is ignored, and the press event is handled.
 */
 void HbInputVkbWidget::sendKeyChangeEvent(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent)
 {
 Q_D(HbInputVkbWidget);
 Q_UNUSED(releaseEvent);
 if (d->mOwner) {
 d->mOwner->filterEvent(&pressEvent);
 }
 }
+/*!
+Updates the animation shown when the keypad language is changed.
+*/
 void HbInputVkbWidget::keypadLanguageChangeAnimationUpdate(qreal value)
 {
 Q_D(HbInputVkbWidget);
 int direction = 1;
 d->mScreenshotWidget->setPos(position.x() + direction * rect.width(), position.y());
 setPos(position);
 }
 }
+/*!
+Cleans up at the end of an animation when the keypad language is changed.
+*/
 void HbInputVkbWidget::keypadLanguageChangeFinished()
 {
 Q_D(HbInputVkbWidget);
 delete d->mScreenshotWidget;
 d->mScreenshotWidget = 0;
 d->mFlickDirection = HbFlickDirectionNone;
 }
+/*!
+Controls the start of an animation when the keyboard is changed.
+*/
 void HbInputVkbWidget::animKeyboardChange()
 {
 Q_D(HbInputVkbWidget);
 if (mainWindow()) {
-if (d->mSettingsListOpen) {
+if (d->mSettingsDialogsOpen) {
 d->mAnimateWhenDialogCloses = true;
 } else {
 if (!d->mAnimateWhenDialogCloses) {
 d->captureScreenshot();
 }
 connect(&d->mScreenshotTimeLine, SIGNAL(valueChanged(qreal)), this, SLOT(keypadLanguageChangeAnimationUpdate(qreal)));
 connect(&d->mScreenshotTimeLine, SIGNAL(finished()), this, SLOT(keypadLanguageChangeFinished()));
+d->mScreenshotWidget->show();
 d->mScreenshotTimeLine.start();
 }
 }
 }
 }
 return sh;
 }
 /*!
-\reimp
+Handles a change event.
 */
 void HbInputVkbWidget::changeEvent(QEvent *event)
 {
 Q_D(HbInputVkbWidget);
 if (event->type() == HbEvent::ThemeChanged) {
 }
 HbWidget::changeEvent(event);
 }
 /*!
-\reimp
+Handles gesture events.
 */
 void HbInputVkbWidget::gestureEvent(QGestureEvent *event)
 {
 Q_D(HbInputVkbWidget);
+// Ignore gesture events if previous flick event is being handled
+if (d->mFlickDirection != HbFlickDirectionNone) {
+return;
+}
 if (HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
 if (gesture->state() == Qt::GestureFinished) {
-HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
 // vertical swipes
 if (gesture->sceneVerticalDirection() == QSwipeGesture::Down) {
 d->mFlickDirection = HbFlickDirectionDown;
+HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
 emit flickEvent(d->mFlickDirection);
 emit keypadCloseEventDetected(HbVkbCloseMethodCloseGesture);
-} else if (gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
+} else if (gesture->sceneVerticalDirection() != QSwipeGesture::Up) {
-d->mFlickDirection = HbFlickDirectionUp;
-emit flickEvent(d->mFlickDirection);
-d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
-} else {
 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))) {
+}
-if (gesture->state() == Qt::GestureFinished) {
+}
-// if keypad is minimized, open it
-if (d->mCurrentHost && d->mCurrentHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized) {
+/*!
-d->mCurrentHost->openKeypad(this, d->mOwner);
+Returns the icon drawer of the object.
-}
+*/
-}
+HbFrameDrawer* HbInputVkbWidget::iconDrawer()
-}
+{
-}
+Q_D(HbInputVkbWidget);
+return d->mIconDrawer;
+}
+/*!
+\fn void HbInputVkbWidget::keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod closeMethod)
+This signal informs that a closing event for the touch keypad was detected.
+*/
+/*!
+\fn void HbInputVkbWidget::flickEvent(HbInputVkbWidget::HbFlickDirection direction)
+This signal is emitted when a flick (swipe) gesture is detected.
+*/
+/*!
+\fn void HbInputVkbWidget::smileySelected(QString text)
+This signal informs that a smiley was selected.
+*/
+/*!
+\fn void HbInputVkbWidget::mouseMovedOutOfButton()
+This signal informs that the mouse was moved out of the pressed button.
+*/
+/*!
+\fn void HbInputVkbWidget::aboutToActivateCustomAction(HbAction *custAction)
+This signal is emitted when the user presses the editor-specific custom button.
+*/
+/*!
+\fn void HbInputVkbWidget::settingsListClosed()
+This signal is emitted when the setting list is closed.
+*/
 #include "moc_hbinputvkbwidget.cpp"
 // End of file

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9