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

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 #include "hbgraphicsscene.h"
 #include "hbgraphicsscene_p.h"
 #include "hbtooltip.h"
 #include "hbglobal_p.h"
 #include "hbvgmaskeffect_p.h"
+#include "hbvgchainedeffect_p.h"
 #include <QTimer>
 #include <QGraphicsSceneMouseEvent>
 #include <QShowEvent>
 #include <QHideEvent>
 #include <QEventLoop>
 #include <QPointer>
 #include <QDebug>
 #include <QBitmap>
+#include <hbinstance_p.h>
 #include <QApplication> // krazy:exclude=qclasses
 #include <hbwidgetfeedback.h>
 #ifdef HB_EFFECTS
 {
 }
 HbPopupPrivate::~HbPopupPrivate()
 {
+stopTimeout();
+delete timeoutTimerInstance;
 }
 void HbPopupPrivate::init()
 {
 Q_Q(HbPopup);
 q->setAttribute(Hb::InsidePopup);
 // By default popups are focusable
 q->setFocusPolicy(Qt::StrongFocus);
-q->setBackgroundItem(HbStyle::P_Popup_background);
+setBackgroundItem(HbStyle::P_Popup_background);
+q->updatePrimitives();
 // Only for popup without parent
 if (!q->parentItem()) {
 backgroundItem = new HbPopupBackGround(q);
 backgroundItem->setVisible(false);
 // Popup is invisible by default (explicit show or open call is required)
 q->setVisible(false);
 }
 hidingInProgress = false;
+QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
-q->setFlag(QGraphicsItem::ItemClipsToShape);
+itemFlags |= QGraphicsItem::ItemClipsToShape;
-q->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
+itemFlags |= QGraphicsItem::ItemClipsChildrenToShape;
+itemFlags |= QGraphicsItem::ItemSendsGeometryChanges;
-#if QT_VERSION > 0x040602
+//itemFlags |= QGraphicsItem::ItemIsPanel;
-q->grabGesture(Qt::TapGesture);
+q->setFlags(itemFlags);
-q->grabGesture(Qt::TapAndHoldGesture);
+}
-q->grabGesture(Qt::PanGesture);
+void HbPopupPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status)
-q->grabGesture(Qt::SwipeGesture);
+{
-q->grabGesture(Qt::PinchGesture);
+	Q_UNUSED(status);
-#endif
+}
-}
+CSystemToneService* HbPopupPrivate::systemToneService()
+{
+	return HbInstancePrivate::d_ptr()->systemTone();
+}
 /*
 Sets the priority for a popup.
 A popup with higher priority is always shown on top of a popup with lower priority.
 In case of popups with same priority the lastly shown will be on top.
 Default priority is HbPopup::Default
 QTimer *HbPopupPrivate::timeoutTimer()
 {
 Q_Q(HbPopup);
 if (!timeoutTimerInstance) {
-timeoutTimerInstance = new QTimer(q);
+timeoutTimerInstance = new QTimer();
 timeoutTimerInstance->setSingleShot(true);
 q->connect(timeoutTimerInstance, SIGNAL(timeout()), q, SLOT(_q_timeoutFinished()));
 }
 return timeoutTimerInstance;
 void HbPopupPrivate::calculateShape()
 {
 #if 0
 Q_Q(HbPopup);
+// Contrary to the name, HbVgMaskEffect has a software
+// implementation too, and we will actually force the usage of
+// that here, ignoring the pure OpenVG version.
 if (!mVgMaskEffect) {
-mVgMaskEffect = new HbVgMaskEffect();
+mVgMaskEffect = new HbVgMaskEffect;
-mVgMaskEffect->install(q);
+// Masking does not work reliably on HW.
-}
+mVgMaskEffect->setForceSwMode(true);
+// There may be children (like the scroll area in menus) that
+// would mess up the masking so exclude those.
+mVgMaskEffect->setIncludeSourceItemOnly(true);
+if (!q->graphicsEffect()) {
+// Attach the effect. Ownership is transferred to q.
+mVgMaskEffect->install(q);
+} else {
+// Avoid replacing already set effects. Do not mask if
+// this is not possible, otherwise we would unexpectedly
+// delete the previously set graphics effect.
+HbVgChainedEffect *c = qobject_cast<HbVgChainedEffect *>(q->graphicsEffect());
+if (c) {
+c->add(mVgMaskEffect);
+} else {
+delete mVgMaskEffect;
+}
+}
+}
 QPixmap image(QSize(static_cast<int>(q->backgroundItem()->boundingRect().width()),
 static_cast<int>(q->backgroundItem()->boundingRect().height())));
 image.fill(Qt::transparent);
 QPainter imagePainter(&image);
 q->backgroundItem()->paint(&imagePainter, 0, 0);
 imagePainter.end();
 mVgMaskEffect->setMask(image);
 #endif
 }
 /*!
 Constructs a popup with given  \a parent graphics item.\n
 {
 Q_D(HbPopup);
 if ( d->frameType != frameType ) {
 switch( frameType ) {
 case HbPopup::Weak:
-setBackgroundItem(HbStyle::P_Popup_background_weak);
+d->setBackgroundItem(HbStyle::P_Popup_background_weak);
 break;
 case HbPopup::Strong:
 default:
-setBackgroundItem(HbStyle::P_Popup_background);
+d->setBackgroundItem(HbStyle::P_Popup_background);
 break;
 }
 d->frameType = frameType;
 updatePrimitives();
 }
 #ifdef HB_EFFECTS
 QRectF extRect(0.0,
 -boundingRect().height(),
 boundingRect().width(),
 0);
+d->mStartEffect = true;
 HbEffect::cancel(this);
-HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
+d->mStartEffect = false;
+HbEffect::start(this, d->effectType, "appear", this, "_q_appearEffectEnded", QVariant(), extRect);
 #endif//HB_EFFECTS
-d->mStartEffect = false;
 } else {
 d->mStartEffect = true;
 }
 }
 }
 HbEffect::cancel(this);
 if (!HbEffect::start(this, d->effectType, "disappear",
 this, "_q_delayedHide",
 QVariant(), extRect)) {
 d->delayedHide = false;
+return HbWidget::itemChange(change, value);
 }
 #endif
 }
 if (hideDelayed) {
 return true;
 this, SLOT(_q_orientationAboutToChange(Qt::Orientation, bool)) );
 disconnect(this, SLOT(_q_orientationChanged()));
 connect( w, SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(_q_orientationChanged()) );
 }
 }
 return HbWidget::itemChange(change, value);
 }
 /*!
 //check if popup needs to be added to scene.This can result in duplciate show event,
 // if popup is added to scene here.
 if(d->addPopupToScene()) {
 d->duplicateShowEvent = true;
 }
+//setActive(true);
 // Popup clears closed state
 d->closed = false;
 if (d->backgroundItem) {
 d->backgroundItem->setVisible(true);
 d->backgroundItem->setAcceptHoverEvents(isModal());
 */
 void HbPopup::resizeEvent( QGraphicsSceneResizeEvent * event )
 {
 HbWidget::resizeEvent(event);
 updatePrimitives();
-#if 1
 Q_D(HbPopup);
 if (d->polished) {
 d->calculateShape();
 }
-#endif
 }
 /*!
 \reimp
 */
 QCoreApplication::sendPostedEvents(this, QEvent::LayoutRequest);
 QRectF extRect(0.0,
 -boundingRect().height(),
 boundingRect().width(),
 0);
+d->mStartEffect = true;
 HbEffect::cancel(this);
-HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
+d->mStartEffect = false;
+HbEffect::start(this, d->effectType, "appear", this, "_q_appearEffectEnded", QVariant(), extRect);
 }
 #endif//HB_EFFECTS
 //workaround ends
 }
 return HbWidget::event(event);
 }
 /*!
 Sets preferred position\a position for popup with \a placement

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55