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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <QGraphicsItem>
 #include <QDebug>
+#include <QCoreApplication>
+#include <QApplication>
 /*!
 @beta
 @hbwidgets
 \class HbPushButton
 //only in case of keyboard focus events it will be Visible.
 focusItem->setVisible( false );
 }
 }
-void HbPushButtonPrivate::_q_handleLongPress(QPointF point)
-{
-Q_Q(HbPushButton);
-if(!longPress){
-longPress = true;
-emit q->longPress( point );
-}
-}
 void HbPushButtonPrivate::_q_handleLongKeyPress( )
 {
 Q_Q( HbPushButton );
 if(!longPress) {
 longPress = true;
 //updatePrimitives();
 if( d->textItem ) {
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 style( )->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
+if ( isEnabled() ) {
+setProperty("state", "normal");
+}
 }
 if(doPolish) {
 repolish( );
 }
 }
 // updatePrimitives();
 if( d->additionalTextItem ) {
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 style( )->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
+if ( isEnabled() ) {
+setProperty("state", "normal");
+}
 }
 if( doPolish ) {
 repolish();
 }
 }
 void HbPushButton::setIcon( const HbIcon &icon )
 {
 Q_D(HbPushButton);
 if ( d->icon != icon ) {
-bool doPolish = icon.isNull( ) || d->icon.isNull();
+//checking for d->polished to avoid extra polish loop
+bool doPolish = (icon.isNull( ) || d->icon.isNull()) && d->polished;
 d->icon = icon;
 d->createPrimitives( );
 //updatePrimitives();
 if( d->iconItem ) {
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
+if ( isEnabled() ) {
+setProperty("state", "normal");
+}
 }
 if( doPolish ) {
 repolish();
 }
 HbAbstractButton(dd, parent)
 {
 }
 /*!
+\reimp
 Initializes \a option with the values from this HbPushButton.
 This method is useful for subclasses when they need a HbStyleOptionPushButton,
 but don't want to fill in all the information themselves.
 */
 void HbPushButton::initStyleOption( HbStyleOptionPushButton *option ) const
 }
 break;
 case Qt::Key_Up:
 case Qt::Key_Left:
 case Qt::Key_Right:
-case Qt::Key_Down:{
+case Qt::Key_Down:
+if( d->keyNavigation()) {
 d->navigationKeyPress = true;
 }
 break;
 }
 HbAbstractButton::keyPressEvent(event);
 }
 break;
 case Qt::Key_Up:
 case Qt::Key_Left:
 case Qt::Key_Right:
-case Qt::Key_Down:{
+case Qt::Key_Down:
+if ( d->keyNavigation() ) {
 d->navigationKeyPress = false;
 }
 break;
 }
 HbAbstractButton::keyReleaseEvent( event );
 #ifdef HB_GESTURE_FW
 void HbPushButton::gestureEvent( QGestureEvent *event )
 {
 Q_D(HbPushButton);
 if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+bool hit = hitButton(mapFromScene(event->mapToGraphicsScene(tap->position())));
 switch(tap->state()) {
-case Qt::GestureStarted:{
+case Qt::GestureStarted:
+if( hit ){
 #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 && hit) {
+d->longPress = true;
+emit longPress( event->mapToGraphicsScene(tap->position()) );
+}
+break;
+case Qt::GestureCanceled:
+setProperty( "state", "normal" );
+break;
+case Qt::GestureFinished:
+if( hit ){
+#ifdef HB_EFFECTS
+HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
+#endif
+}
 if( d->checkable && !d->checked) {
 setProperty( "state", "latched" );
-}else if(!d->checkable) {
+}else {
-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;
-default:
+}
-break;
+}
-}
-}
 HbAbstractButton::gestureEvent( event );
 }
 #endif
 /*!

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55