FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hbpushbutton.cpp

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include "hbpushbutton.h"
 #include "hbpushbutton_p.h"
 #include "hbstyle.h"
 #include "hbstyleoptionpushbutton.h"
-#include "hbgesturefilter.h"
-#include "hbgesture.h"
 #include "hbframedrawerpool_p.h"
 #include "hbnamespace.h"
 #ifdef HB_EFFECTS
 #include "hbeffect.h"
 #include "hbeffectinternal_p.h"
+#endif
+#ifdef HB_GESTURE_FW
+#include <hbtapgesture.h>
 #endif
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <QGraphicsItem>
 iconItem(0),
 frameItem(0),
 focusItem(0),
 orientation(Qt::Vertical),
 backgroundFrameDrawer(0),
-gestureFilter(0),
-gestureLongpressed(0),
 longPressTimer(0),
 textAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
 additionalTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
 stretched(false),
 navigationKeyPress(false),
 /*
 Destructor.
 */
 HbPushButtonPrivate::~HbPushButtonPrivate()
 {
-if(gestureFilter){
-delete gestureFilter;
-gestureFilter = NULL;
-}
 }
 /*
 createPrimitives.
 */
 iconItem = 0;
 }
 if( !touchArea ) {
 touchArea = q->style()->createPrimitive( HbStyle::P_PushButton_toucharea, q );
+if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(touchArea)) {
+ta->grabGesture(Qt::TapGesture);
+q->ungrabGesture(Qt::TapGesture);
+} else {
+q->grabGesture(Qt::TapGesture);
+}
 }
 if( !focusItem ) {
 focusItem = q->style()->createPrimitive(HbStyle::P_PushButton_focus, q);
 //focus primitive is will not be visible by default,
 //only in case of keyboard focus events it will be Visible.
 focusItem->setVisible( false );
 }
 }
-/*
-initGesture.
-*/
-void HbPushButtonPrivate::initGesture()
-{
-Q_Q(HbPushButton);
-// Create gesture filter
-gestureFilter = new HbGestureSceneFilter( Qt::LeftButton, q );
-// Add gestures for longpress
-gestureLongpressed = new HbGesture( HbGesture::longpress,5 );
-gestureFilter->addGesture( gestureLongpressed );
-// scene event filter for gesture can be installed
-// if widget is already added to scene
-if (q->scene()) {
-q->installSceneEventFilter(gestureFilter);
-if (touchArea) {
-touchArea->installSceneEventFilter(gestureFilter);
-}
-}
-}
 void HbPushButtonPrivate::_q_handleLongPress(QPointF point)
 {
 Q_Q(HbPushButton);
 if(!longPress){
 void HbPushButtonPrivate::initialize()
 {
 Q_Q(HbPushButton);
 q_ptr = q;
 createPrimitives();
-initGesture();
 }
 /*!
 @beta
 Constructs a new HbPushButton with \a parent.
 HbPushButton::HbPushButton( QGraphicsItem *parent )
 : HbAbstractButton( *new HbPushButtonPrivate, parent )
 {
 Q_D(HbPushButton);
 d->initialize();
-connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-this, SLOT(_q_handleLongPress(QPointF)));
 setProperty("state", "normal");
 }
 /*!
 : HbAbstractButton(*new HbPushButtonPrivate, parent)
 {
 Q_D(HbPushButton);
 d->text = text;
 d->initialize();
-connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-this, SLOT(_q_handleLongPress(QPointF)) );
 setProperty("state", "normal");
 }
 {
 Q_D(HbPushButton);
 d->icon = icon;
 d->text = text;
 d->initialize();
-connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-this, SLOT(_q_handleLongPress(QPointF)) );
 setProperty("state", "normal");
 }
 /*!
 Q_D(HbPushButton);
 d->icon = icon;
 d->text = text;
 d->initialize();
 d->orientation = orientation;
-connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-this, SLOT(_q_handleLongPress(QPointF)) );
 setProperty("state", "normal");
 }
 /*!
 Destructs the push button.
 */
 HbPushButton::~HbPushButton()
 {
-Q_D(HbPushButton);
-if( d->gestureFilter ) {
-removeSceneEventFilter( d->gestureFilter );
-}
 }
 /*!
 @beta
 Sets the \a background of the button.
 Q_D(const HbPushButton);
 return d->stretched;
 }
 /*!
+\deprecated HbPushButton::primitive(HbStyle::Primitive)
+is deprecated.
 \reimp
 */
 QGraphicsItem* HbPushButton::primitive( HbStyle::Primitive primitive ) const
 {
 Q_D(const HbPushButton);
 \internal
 */
 HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem * parent) :
 HbAbstractButton(dd, parent)
 {
-Q_D(HbPushButton);
-d->initGesture();
-connect( d->gestureLongpressed, SIGNAL(longPress(QPointF)),
-this, SLOT(_q_handleLongPress(QPointF)) );
 }
 /*!
 Initializes \a option with the values from this HbPushButton.
 This method is useful for subclasses when they need a HbStyleOptionPushButton,
 /*!
 \reimp
 */
 void HbPushButton::mousePressEvent( QGraphicsSceneMouseEvent *event )
 {
+#ifndef HB_GESTURE_FW
 Q_D(HbPushButton);
 HbAbstractButton::mousePressEvent(event);
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 if( d->frameItem ){
 if ( hitButton(event->pos()) ){
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
 }
 #endif
 setProperty("state", "pressed");
-}
+#else
+Q_UNUSED(event)
+#endif
+}
+#ifndef HB_GESTURE_FW
 /*!
 \reimp
 */
 void HbPushButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
 initStyleOption( &buttonOption );
 if( d->frameItem ){
 style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 if (d->down) {
 setProperty("state", "pressed");
 } else {
 setProperty("state", "normal");
 }
 }
+#endif
+#ifdef HB_GESTURE_FW
+void HbPushButton::gestureEvent(QGestureEvent *event)
+{
+Q_D(HbPushButton);
+if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+switch(tap->state()) {
+case Qt::GestureStarted:{
+#ifdef HB_EFFECTS
+HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
+#endif
+if(d->checkable && !d->checked){
+setProperty("state", "latched");
+}else if(!d->checkable){
+setProperty("state", "pressed");
+}
+}
+break;
+case Qt::GestureUpdated:
+if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
+d->longPress = true;
+emit longPress(event->mapToGraphicsScene(tap->position()));
+}
+break;
+case Qt::GestureCanceled:
+setProperty("state", "normal");
+break;
+case Qt::GestureFinished:{
+#ifdef HB_EFFECTS
+HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
+#endif
+if( d->checkable && !d->checked){
+setProperty("state", "latched");
+}else {
+setProperty("state", "normal");
+}
+}
+break;
+default:
+break;
+}
+}
+HbAbstractButton::gestureEvent(event);
+}
+#endif
 /*!
 \reimp
 */
 /*!
 \reimp
 */
 QVariant HbPushButton::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-Q_D(HbPushButton);
 switch ( change ) {
 case ItemEnabledHasChanged:
 case ItemVisibleChange: {
 updatePrimitives( );
 }
 break;
 case ItemSceneHasChanged: {
-// scene event filter for gestures can be installed
-// once the widget has been added to the scene
-if(!value.isNull() && d->gestureFilter) {
-installSceneEventFilter(d->gestureFilter);
-if (d->touchArea) {
-d->touchArea->installSceneEventFilter(d->gestureFilter);
-}
-}
 updatePrimitives();
 }
 break;
 default:
 break;

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9