FCL/sf/mw/hb: comparison src/hbcore/vkbhosts/hbabstractvkbhost.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 const qreal HbCursorLineMargin = 15.0;
 const qreal HbContainerBorderMargin = 20.0;
 const qreal HbHeightVerticalFactor = 0.5;
 const qreal HbHeightHorizFactor = 0.7;
 const QString KHandWritingName("Handwriting");
+// see hbpopup.cpp for this
+extern const char* KPositionManagedByVKB;
+/// @cond
 HbVkbHostContainerWidget::HbVkbHostContainerWidget(QObject *containterWidget)
-:mContainerWidget(containterWidget)
+: mContainerWidget(containterWidget)
 {
 }
 // sets container widgets position to new position.
 void HbVkbHostContainerWidget::setPos(QPointF newPosition)
 }
 QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
 if (qWidget) {
 #ifdef Q_WS_WIN
 QPoint finalPosition = newPosition.toPoint();
 finalPosition -= qWidget->geometry().topLeft() - qWidget->frameGeometry().topLeft();
 qWidget->move(finalPosition);
 #else
 qWidget->move(newPosition.toPoint());
 #endif
 return;
 }
 }
 }
 {
 if (mContainerWidget) {
 QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(mContainerWidget);
 if (graphicsObject) {
 return graphicsObject->pos();;
 }
 QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
 if (qWidget) {
-return qWidget->mapToGlobal(QPoint(0,0));
+return qWidget->mapToGlobal(QPoint(0, 0));
 }
 }
 return QPointF(0, 0);
 }
 {
 if (mContainerWidget) {
 QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(mContainerWidget);
 if (graphicsObject) {
 return graphicsObject->sceneBoundingRect();;
 }
 QWidget *qWidget = qobject_cast<QWidget *>(mContainerWidget);
 if (qWidget) {
-return QRectF(qWidget->mapToGlobal(QPoint(0,0)), qWidget->size());
+return QRectF(qWidget->mapToGlobal(QPoint(0, 0)), qWidget->size());
 }
 }
 return QRectF(0, 0, 0, 0);
 }
 // connect container specific signals here.
-void HbVkbHostContainerWidget::connectSignals(QObject *reciever)
+void HbVkbHostContainerWidget::connectSignals(QObject *receiver)
 {
-if (qobject_cast<QGraphicsObject*> (mContainerWidget)) {
+if (qobject_cast<QGraphicsObject *> (mContainerWidget)) {
-QObject::connect(mContainerWidget, SIGNAL(yChanged())
+QObject::connect(mContainerWidget, SIGNAL(yChanged()),
-, reciever, SLOT(ensureCursorVisibility()));
+receiver, SLOT(ensureCursorVisibility()));
 }
-HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
+HbPopup *popup = qobject_cast<HbPopup *>(mContainerWidget);
 if (popup) {
-QObject::connect(popup, SIGNAL(aboutToHide()), reciever, SLOT(containerAboutToClose()));
+QObject::connect(popup, SIGNAL(aboutToHide()), receiver, SLOT(containerAboutToClose()));
 }
-HbView *view = qobject_cast<HbView*>(mContainerWidget);
+HbView *view = qobject_cast<HbView *>(mContainerWidget);
 if (view) {
-QObject::connect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *))
+QObject::connect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *)),
-, reciever, SLOT(currentViewChanged(HbView *)));
+receiver, SLOT(currentViewChanged(HbView *)));
 }
 }
 // disconnect container specific signals here.
-void HbVkbHostContainerWidget::disconnectSignals(QObject *reciever)
+void HbVkbHostContainerWidget::disconnectSignals(QObject *receiver)
 {
-if (qobject_cast<QGraphicsObject*> (mContainerWidget)) {
+if (qobject_cast<QGraphicsObject *> (mContainerWidget)) {
-QObject::disconnect(mContainerWidget, SIGNAL(yChanged())
+QObject::disconnect(mContainerWidget, SIGNAL(yChanged()),
-, reciever, SLOT(ensureCursorVisibility()));
+receiver, SLOT(ensureCursorVisibility()));
 }
-HbPopup *popup = qobject_cast<HbPopup*>(mContainerWidget);
+HbPopup *popup = qobject_cast<HbPopup *>(mContainerWidget);
 if (popup) {
-QObject::disconnect(popup, SIGNAL(aboutToHide()), reciever, SLOT(containerAboutToClose()));
+QObject::disconnect(popup, SIGNAL(aboutToHide()), receiver, SLOT(containerAboutToClose()));
 }
-HbPopup *view = qobject_cast<HbPopup*>(mContainerWidget);
+HbPopup *view = qobject_cast<HbPopup *>(mContainerWidget);
 if (view) {
-QObject::disconnect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *))
+QObject::disconnect(view->mainWindow(), SIGNAL(currentViewChanged(HbView *)),
-, reciever, SLOT(currentViewChanged(HbView *)));
+receiver, SLOT(currentViewChanged(HbView *)));
 }
 }
+/// @endcond
 /*!
 \proto
 \class HbAbstractVkbHost
 \brief Base class for HbCore's virtual keyboard hosts.
 */
 /// @cond
 HbAbstractVkbHostPrivate::HbAbstractVkbHostPrivate(HbAbstractVkbHost *myHost, QObject *containerWidget)
 : q_ptr(myHost),
 mCallback(0),
 mKeypad(0),
 mContainerWidget(new HbVkbHostContainerWidget(containerWidget)),
 mTimeLine(HbAnimationTime),
 mKeypadStatus(HbVkbHost::HbVkbStatusClosed),
 mKeypadOperationOngoing(false),
-mOriginalContainerPosition(QPointF(0,0)),
+mOriginalContainerPosition(QPointF(0, 0)),
 mContainerMovementStartingPoint(QPointF(0, 0)),
 mContainerMovementVector(QPointF(0, 0)),
 mKeypadMovementStartingPoint(QPointF(0, 0)),
 mKeypadMovementVector(QPointF(0, 0)),
 mInputMethod(0),
 mKeypadStatusBeforeOrientationChange(HbVkbHost::HbVkbStatusClosed)
 {
 mTimeLine.setUpdateInterval(16);
 }
 HbAbstractVkbHostPrivate::~HbAbstractVkbHostPrivate()
 bool HbAbstractVkbHostPrivate::prepareKeypadAnimation(HbVkbHost::HbVkbStatus status)
 {
 if (status == HbVkbHost::HbVkbStatusOpened) {
 if (mKeypadStatus == HbVkbHost::HbVkbStatusClosed) {
 // Set up keyboard open animation.
 mKeypadMovementStartingPoint.setY(mScreenSize.height());
 mKeypadMovementVector.setY(-mKeypad->size().height());
 if (!disableCursorShift()) {
 // Initialize keypad position
 mKeypad->setPos(mKeypadMovementStartingPoint);
 }
 return true;
 } else if (mKeypadStatus == HbVkbHost::HbVkbStatusMinimized && mCallback) {
 mKeypadMovementVector.setY(-(mKeypad->size().height() - mCallback->minimizedKeyboardSize().height()));
 return true;
 }
 } else if (status == HbVkbHost::HbVkbStatusMinimized && mCallback) {
 mKeypadMovementVector = QPointF(0, mKeypad->size().height() - mCallback->minimizedKeyboardSize().height());
 return true;
 } else {
 // It is going to be closed.
 void HbAbstractVkbHostPrivate::connectSignals()
 {
 mContainerWidget->connectSignals(q_ptr);
 // global signal not specific to any containter widget, can be connected now.
-HbMainWindow* mainWindow = this->mainWindow();
+HbMainWindow *mainWindow = this->mainWindow();
 if (mainWindow) {
 q_ptr->connect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
 q_ptr->connect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
-q_ptr->connect(mainWindow, SIGNAL(currentViewChanged(HbView*)), q_ptr, SLOT(currentViewChanged(HbView*)));
+q_ptr->connect(mainWindow, SIGNAL(currentViewChanged(HbView *)), q_ptr, SLOT(currentViewChanged(HbView *)));
 }
 }
 void HbAbstractVkbHostPrivate::disconnectSignals()
 {
 mContainerWidget->disconnectSignals(q_ptr);
 // global signal not specific to any containter widget, can be connected now.
-HbMainWindow* mainWindow = this->mainWindow();
+HbMainWindow *mainWindow = this->mainWindow();
 if (mainWindow) {
 q_ptr->disconnect(mainWindow, SIGNAL(aboutToChangeOrientation()), q_ptr, SLOT(orientationAboutToChange()));
 q_ptr->disconnect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)), q_ptr, SLOT(orientationChanged(Qt::Orientation)));
-q_ptr->disconnect(mainWindow, SIGNAL(currentViewChanged(HbView*)), q_ptr, SLOT(currentViewChanged(HbView*)));
+q_ptr->disconnect(mainWindow, SIGNAL(currentViewChanged(HbView *)), q_ptr, SLOT(currentViewChanged(HbView *)));
 }
 }
 void HbAbstractVkbHostPrivate::openKeypad()
 {
 if (mContainerWidget->widgetObject()) {
-HbMainWindow* mainWin = mainWindow();
+HbMainWindow *mainWin = mainWindow();
 if (mainWin && mKeypad) {
 if (mKeypad->scene() != mainWin->scene()) {
 // Add keypad to scene if it is not already in there.
 mainWin->scene()->addItem(mKeypad);
 }
 }
 void HbAbstractVkbHostPrivate::openKeypadWithoutAnimation()
 {
 HbMainWindow *mainWin = mainWindow();
-if (mKeypadStatus!= HbVkbHost::HbVkbStatusOpened && mKeypad && mContainerWidget->widgetObject() && mainWin) {
+if (mKeypadStatus != HbVkbHost::HbVkbStatusOpened && mKeypad && mContainerWidget->widgetObject() && mainWin) {
 if (mKeypad->scene() != mainWin->scene()) {
 // Add item to scene if it is not already in there.
 mainWin->scene()->addItem(mKeypad);
 }
 }
 if (prepareAnimations(HbVkbHost::HbVkbStatusOpened)) {
 if (!disableCursorShift()) {
 // Move the container widget to keep the focused line visible.
 mContainerWidget->setPos(mContainerWidget->pos() + mContainerMovementVector);
 // Move the keypad
 mKeypad->setPos(mKeypadMovementStartingPoint + mKeypadMovementVector);
 }
 mKeypadStatus = HbVkbHost::HbVkbStatusOpened;
 // Add item to scene if it is not already in there.
 mainWin->scene()->addItem(mKeypad);
 }
 if (mKeypadStatus != HbVkbHost::HbVkbStatusMinimized) {
 mCallback->aboutToOpen(q_ptr);
 q_ptr->resizeKeyboard(); // Make sure that the keyboard doesn't exceed given boundaries.
 }
 if (prepareAnimations(HbVkbHost::HbVkbStatusMinimized)) {
 if (!disableCursorShift()) {
 mKeypad->setPos(0.0, mScreenSize.height() - mCallback->minimizedKeyboardSize().height());
 }
 mKeypadStatus = HbVkbHost::HbVkbStatusMinimized;
 mCallback->keyboardMinimized(q_ptr);
 mKeypadStatus = HbVkbHost::HbVkbStatusClosed;
 if (!disableCursorShift()) {
 // Return the container widget to original position.
 mContainerWidget->setPos(mOriginalContainerPosition);
+mContainerWidget->widgetObject()->setProperty(KPositionManagedByVKB, false );
 }
 // Hide the keypad
 mKeypad->hide();
 mCallback->keyboardClosed(q_ptr);
 void HbAbstractVkbHostPrivate::minimizeKeypadWithoutAnimation()
 {
 HbMainWindow *mainWin = mainWindow();
 if (mKeypadStatus != HbVkbHost::HbVkbStatusMinimized && mKeypad && mainWin) {
 mCallback->aboutToClose(q_ptr);
 if (mKeypad->scene() != mainWin->scene()) {
 // Add item to scene if it is not already in there.
 mainWin->scene()->addItem(mKeypad);
 }
 if (mTimeLine.state() == QTimeLine::Running) {
 mTimeLine.stop();
 if (!disableCursorShift()) {
 mContainerWidget->setPos(mOriginalContainerPosition);
+mContainerWidget->widgetObject()->setProperty(KPositionManagedByVKB, false );
 }
 if (mKeypad) {
 mKeypad->hide();
 }
 }
 }
 HbMainWindow *HbAbstractVkbHostPrivate::mainWindow() const
 {
-HbWidget *hbWidget = qobject_cast<HbWidget*>(mContainerWidget->widgetObject());
+HbWidget *hbWidget = qobject_cast<HbWidget *>(mContainerWidget->widgetObject());
 if (hbWidget) {
 return hbWidget->mainWindow();
 }
 // below is the case when we have a pure vanilla application.
 // there should be one hbmainwindow to show all the widgets.
-if (hbInstance->allMainWindows().size())
+if (hbInstance->allMainWindows().size()) {
 return hbInstance->allMainWindows().at(0);
+}
 // no mainwindow.
 return 0;
 }
 {
 HbMainWindow *mainWin = mainWindow();
 QSizeF result = static_cast<QSizeF>(HbDeviceProfile::profile(mainWin).logicalSize());
 // do some sanity checking for the size got from device profile
-if( result.isNull() || result.width() < 200 || result.height() < 200 ) {
+if (result.isNull() || result.width() < 200 || result.height() < 200) {
 qWarning("VkbHost error: size from device profile is faulty, using fallback!");
 if (mainWin) {
 if (mainWin->orientation() == Qt::Horizontal) {
 result.setWidth(640);
 result.setHeight(360);
 }
 return result;
 }
-bool HbAbstractVkbHostPrivate::disableCursorShift() {
+bool HbAbstractVkbHostPrivate::disableCursorShift()
+{
 if (!mInputMethod
 || mainWindow()) {
 return false;
 }
 }
 /*!
 \reimp
 */
+void HbAbstractVkbHost::openKeypad(HbVirtualKeyboard *vkb, HbInputMethod *owner, bool animationAllowed)
-void HbAbstractVkbHost::openKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner, bool animationAllowed)
 {
 Q_D(HbAbstractVkbHost);
 if (owner) {
 d->mInputMethod = owner;
 return;
 }
 if (!HbVkbHostBridge::instance()->connectHost(this)) {
 // Do not set open call pending if orientation change is ongoing
-if (HbInputSettingProxy::instance()->orientationChangeCompleted()) {
+connect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
-connect(HbVkbHostBridge::instance(), SIGNAL(stateTransitionCompleted()), this, SLOT(stateTransitionCompleted()));
+// The previous keyboard is still closing. Set the call pending and return.
-// The previous keyboard is still closing. Set the call pending and return.
+d->mPendingCall.vkb = vkb;
-d->mPendingCall.vkb = vkb;
+d->mPendingCall.animationAllowed = animationAllowed;
-d->mPendingCall.animationAllowed = animationAllowed;
-}
 return;
 }
 if (!d->mKeypadOperationOngoing) {
 d->mKeypadOperationOngoing = true;
 return;
 }
 emit aboutToOpen();
+if (d->mContainerWidget && d->mContainerWidget->widgetObject()) {
+d->mContainerWidget->widgetObject()->setProperty(KPositionManagedByVKB, true );
+}
 if (animationAllowed) {
 d->openKeypad();
 } else {
 d->openKeypadWithoutAnimation();
 emit keypadOpened();
 }
-HbWidgetFeedback::triggered(qobject_cast<const HbWidget*>(d->mKeypad), Hb::InstantPopupOpened);
+HbWidgetFeedback::triggered(qobject_cast<const HbWidget *>(d->mKeypad), Hb::InstantPopupOpened);
 d->connectSignals();
 d->mKeypadOperationOngoing = false;
 }
 }
 {
 Q_D(HbAbstractVkbHost);
 if (!d->disableCursorShift()) {
 // Move the container.
 if (d->mContainerWidget->widgetObject()) {
 d->mContainerWidget->setPos(d->mContainerMovementStartingPoint + (d->mContainerMovementVector * value));
 }
 // Move keypad
 if (d->mKeypad) {
 if (d->mKeypadStatus == HbVkbHost::HbVkbStatusOpened) {
 d->mCallback->keyboardOpened(this);
 if (d->mInputMethod->focusObject()) {
 // This is hopefully temporary...
-QTextEdit *textEdit = qobject_cast<QTextEdit*>(d->mInputMethod->focusObject()->object());
+QTextEdit *textEdit = qobject_cast<QTextEdit *>(d->mInputMethod->focusObject()->object());
 if (textEdit) {
 textEdit->ensureCursorVisible();
 }
 }
 } else {
 // It was closed. Hide the keyboard.
 d->mKeypad->hide();
 // Return the container where it was.
 d->mContainerWidget->setPos(d->mOriginalContainerPosition);
+d->mContainerWidget->widgetObject()->setProperty(KPositionManagedByVKB, false );
 d->mCallback->keyboardClosed(this);
 emit keypadClosed();
 HbVkbHostBridge::instance()->connectHost(0);
 }
 }
 */
 void HbAbstractVkbHost::orientationAboutToChange()
 {
 Q_D(HbAbstractVkbHost);
 d->mKeypadStatusBeforeOrientationChange = d->mKeypadStatus;
-HbInputSettingProxy::instance()->notifyScreenOrientationChange();
 }
 /*!
 This slot is connected to orientation change signal from the framework and notifies
 the setting proxy. Notification will then be froearded to other interested parties
 by the setting proxy.
 */
 void HbAbstractVkbHost::orientationChanged(Qt::Orientation orientation)
 {
-HbInputSettingProxy::instance()->setScreenOrientation(orientation);
+Q_UNUSED(orientation);
 }
 /*!
 \reimp
 */
-HbVirtualKeyboard* HbAbstractVkbHost::activeKeypad() const
+HbVirtualKeyboard *HbAbstractVkbHost::activeKeypad() const
 {
 Q_D(const HbAbstractVkbHost);
 return d->mCallback;
 }
 if ((d->mTimeLine.state() == QTimeLine::Running) ||
 (d->mKeypadStatus == HbVkbStatusClosed) ||
 (d->mKeypadStatus == HbVkbStatusMinimized) ||
 !d->mContainerWidget->widgetObject()) {
 return;
 }
 // This will refresh the situation if needed.
 d->openKeypad();
 }
 QSizeF HbAbstractVkbHost::confirmedKeyboardSize()const
 {
 Q_D(const HbAbstractVkbHost);
 if (d->mCallback && d->mKeypad) {
 QSizeF kbArea = keyboardArea();
 QSizeF confirmed = d->mCallback->preferredKeyboardSize();
 if (confirmed.width() > kbArea.width()) {
 confirmed.setWidth(kbArea.width());
 }
 }
 /*!
 \reimp
 */
-void HbAbstractVkbHost::openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner)
+void HbAbstractVkbHost::openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod *owner)
 {
 Q_D(HbAbstractVkbHost);
 d->mInputMethod = owner;
 if (!d->mKeypadOperationOngoing) {
 void HbAbstractVkbHost::currentViewChanged(HbView *view)
 {
 Q_D(HbAbstractVkbHost);
 if (view != d->mContainerWidget->widgetObject()) {
 if (d->mTimeLine.state() == QTimeLine::Running) {
 d->cancelAnimationAndHideVkbWidget();
 if (d->mCallback) {
 d->mCallback->keyboardClosed(this);
 }
 } else if (d->mKeypadStatus != HbVkbStatusClosed) {
 d->closeKeypadWithoutAnimation();
 emit keypadClosed();
 }
 }
 /*!
 \reimp
 */
 void HbAbstractVkbHost::refresh()
 {
 Q_D(HbAbstractVkbHost);
 if (d->mKeypadStatus == HbVkbHost::HbVkbStatusOpened &&
 d->mTimeLine.state() != QTimeLine::Running) {
 d->prepareAnimationsCommon();
 if (d->prepareContainerAnimation(HbVkbHost::HbVkbStatusOpened)) {
 // Container status needs to be updated. Run the animation.
 d->mTimeLine.start();
 }
 }
 }
 /*!
 \reimp
 */
 bool HbAbstractVkbHost::stateTransitionOngoing() const
 {
 Q_D(const HbAbstractVkbHost);
 return (d->mTimeLine.state() == QTimeLine::Running);
 }
 /*!
 Receives signal from HbVkbHostBridge when previous host completes its state
 transition and sens pending call if any.

changeset 6	c3690ec91ef8
parent 5	627c4a0fd0e7
child 21	4633027730f5
child 34	ed14f46c0e55