FCL/sf/mw/hb: comparison src/hbcore/gui/hbpopup.cpp

equal deleted inserted replaced

-:b7da29130b0e
+:80e4d18b72f5
 {HbPopup::NoTimeout,0},
 {HbPopup::ConfirmationNoteTimeout,1500},
 {HbPopup::StandardTimeout,3000},
 {HbPopup::ContextMenuTimeout,6000},
 };
+/*
+Currently, virtual keyboard must be able to position a popup
+containing an editor to an arbitrary place. VKB does its best to
+reposition the popup back to original position when needed. At least in
+orientation switch the old position naturally is wrong, hence popup
+must be relayouted.
+It would be unreasonable to make special checks for popup in vkb
+side. It also would be unreasonable to do special checks for vkb in
+popup side. Hence this semi-hidden dynamic property for
+communicating this special case.
+WARNING: Do not count on this special behaviour, we might remove it
+without prior notice. If you do require such a behavior, please
+raise a feature request and we might make this a proper API.
+*/
+const char* KPositionManagedByVKB("PositionManagedByVKB");
 /*
 \primitives
 \primitive{background} HbFrameItem representing the popup background. The background can be
 weak or strong (different graphical styles) depending on popup type.
 itemFlags |= QGraphicsItem::ItemClipsChildrenToShape;
 itemFlags |= QGraphicsItem::ItemSendsGeometryChanges;
 itemFlags |= QGraphicsItem::ItemIsPanel;
 q->setFlags(itemFlags);
 q->setActive(false);
+q->setAcceptTouchEvents(true);
 }
 void HbPopupPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status)
 {
 Q_UNUSED(status);
+}
+void HbPopupPrivate::_q_maskEffectDestroyed()
+{
+mVgMaskEffect = 0;
 }
 CSystemToneService* HbPopupPrivate::systemToneService()
 {
 return HbInstancePrivate::d_ptr()->systemTone();
 void HbPopupPrivate::_q_orientationChanged()
 {
 Q_Q(HbPopup);
 if (q->isVisible() || q) {
-QEvent userEvent(QEvent::ContextMenu);
+QEvent userEvent(QEvent::LayoutRequest);
 QCoreApplication::sendEvent(q, &userEvent);
 }
 q->repolish();
 #ifdef HB_EFFECTS
 } else {
 delete mVgMaskEffect;
 mVgMaskEffect = 0;
 }
 }
+if (mVgMaskEffect) {
+// Make sure that mask effect is reset when destroyed
+QObject::connect(mVgMaskEffect, SIGNAL(destroyed()), q, SLOT(_q_maskEffectDestroyed()));
+}
 }
 QPixmap image(q->backgroundItem()->boundingRect().size().toSize());
 image.fill(Qt::transparent);
 QPainter imagePainter(&image);
 q->backgroundItem()->paint(&imagePainter, 0, 0);
 HbPopup::HbPopup(QGraphicsItem *parent) :
 HbWidget(*new HbPopupPrivate,parent)
 {
 Q_D(HbPopup);
 d->q_ptr = this;
 d->init();
 }
 /*!
 \internal
 HbPopup::HbPopup(HbPopupPrivate &dd, QGraphicsItem *parent) :
 HbWidget(dd, parent)
 {
 Q_D(HbPopup);
 d->q_ptr = this;
 d->init();
 }
 /*!
 Destructor.
 */
 HbPopup::~HbPopup()
 */
 QVariant HbPopup::itemChange ( GraphicsItemChange change, const QVariant & value )
 {
 Q_D(HbPopup);
 if (change == QGraphicsItem::ItemPositionChange) {
+// Skipping X-coordinate changes made by VKB since popupmanager handles popup to be in the
+// center of the screen
+if (property(KPositionManagedByVKB).isValid() && property(KPositionManagedByVKB).toBool() &&
+!d->mAutoLayouting && value.isValid() && !value.toPointF().isNull()) {
+QPointF newPointF(geometry().x(), value.toPointF().y());
+d->mAutoLayouting = false;
+return newPointF;
+}
 d->mAutoLayouting = false;
 }
 if (change == QGraphicsItem::ItemVisibleHasChanged) {
 if (value.toBool()) {
 if (d->hasEffects && boundingRect().isValid() && d->polished) {
 }
 d->memberToDisconnectOnClose.clear();
 HbWidget::closeEvent(event);
 }
-/*
-Currently, virtual keyboard must be able to position a popup
-containing an editor to an arbitrary place. VKB does its best to
-reposition the popup back to original position when needed. At least in
-orientation switch the old position naturally is wrong, hence popup
-must be relayouted.
-It would be unreasonable to make special checks for popup in vkb
-side. It also would be unreasonable to do special checks for vkb in
-popup side. Hence this semi-hidden dynamic property for
-communicating this special case.
-WARNING: Do not count on this special behaviour, we might remove it
-without prior notice. If you do require such a behavior, please
-raise a feature request and we might make this a proper API.
-*/
-const char* KPositionManagedByVKB("PositionManagedByVKB");
 /*!
 Reimplemented from QGraphicsWidget.
 */
 bool HbPopup::event(QEvent *event)
 {
 // of times but in this case we have to do it manually.
 new HbPopupUpdater(this, this);
 }
 #endif //HB_EFFECTS
 //workaround ends
+} else if (event->type() == QEvent::TouchBegin) {
+// Accept all touch begin events to get the full Begin..End sequence
+event->accept();
+return true;
 } else if (d->mGestureOverride && event->type() == QEvent::GestureOverride) {
 event->accept();
 return true;
 }

changeset 30	80e4d18b72f5
parent 28	b7da29130b0e