equal
deleted
inserted
replaced
25 |
25 |
26 #include "hbslidercontrol_p.h" |
26 #include "hbslidercontrol_p.h" |
27 #include "hbslidercontrol_p_p.h" |
27 #include "hbslidercontrol_p_p.h" |
28 #include "hbabstractslidercontrol_p.h" |
28 #include "hbabstractslidercontrol_p.h" |
29 #include "hbsliderhandle_p.h" |
29 #include "hbsliderhandle_p.h" |
30 #include "hbstyleoptionslider.h" |
30 #include "hbstyleoptionslider_p.h" |
31 #include "hbslidertickmarkslabel_p.h" |
31 #include "hbslidertickmarkslabel_p.h" |
32 #include "hbslidertickmarkslabel_p.h" |
32 #include "hbslidertickmarkslabel_p.h" |
33 #include <hbstyle.h> |
33 #include <hbstyle.h> |
34 #include <hbinstance.h> |
34 #include <hbinstance.h> |
35 #include <hbtheme.h> |
35 #include <hbtheme.h> |
1102 if (HbPanGesture *panGesture = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) { |
1102 if (HbPanGesture *panGesture = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) { |
1103 switch(panGesture->state( )) { |
1103 switch(panGesture->state( )) { |
1104 case Qt::GestureStarted: |
1104 case Qt::GestureStarted: |
1105 case Qt::GestureUpdated:{ |
1105 case Qt::GestureUpdated:{ |
1106 QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) ); |
1106 QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) ); |
1107 if( d->onHandle( startPoint)||isSliderDown( ) ) { |
1107 if( ( d->onHandle( startPoint) && d->grooveTouchArea->sceneBoundingRect( ).contains( startPoint))||isSliderDown( ) ) { |
1108 qreal handlePos = 0; |
1108 qreal handlePos = 0; |
1109 qreal span = 0; |
1109 qreal span = 0; |
1110 QRectF bounds = boundingRect( ); |
1110 QRectF bounds = boundingRect( ); |
1111 QRectF handleBounds = d->handle->boundingRect( ); |
1111 QRectF handleBounds = d->handle->boundingRect( ); |
1112 bounds.adjust( 0, 0, -handleBounds.width( ), -handleBounds.height( ) ); |
1112 bounds.adjust( 0, 0, -handleBounds.width( ), -handleBounds.height( ) ); |
1143 initStyleOption( &opt ); |
1143 initStyleOption( &opt ); |
1144 style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt ); |
1144 style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt ); |
1145 HbWidgetFeedback::triggered( this, Hb::InstantPressed ); |
1145 HbWidgetFeedback::triggered( this, Hb::InstantPressed ); |
1146 event->ignore(); |
1146 event->ignore(); |
1147 break; |
1147 break; |
1148 } |
1148 } |
1149 } |
1149 } |
1150 case Qt::GestureFinished: |
1150 case Qt::GestureFinished: |
1151 case Qt::GestureCanceled: { |
1151 case Qt::GestureCanceled: { |
1152 setSliderDown( false ); |
1152 setSliderDown( false ); |
1153 d->groovePressed = false; |
1153 d->groovePressed = false; |
1154 updatePrimitives( ); |
1154 updatePrimitives( ); |
1155 d->handle->updatePrimitives(); |
1155 d->handle->updatePrimitives(); |
1156 d->handleMoving = false; |
1156 d->handleMoving = false; |
1157 event->ignore(); |
1157 event->ignore(); |
|
1158 HbAbstractSliderControl::gestureEvent(event); |
1158 } |
1159 } |
1159 default: |
1160 default: |
1160 break; |
1161 break; |
1161 } |
1162 } |
1162 } |
1163 } |