FCL/sf/mw/hb: comparison src/hbwidgets/sliders/hbslidercontrol.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 #include "hbslidercontrol_p_p.h"
 #include "hbabstractslidercontrol_p.h"
 #include "hbsliderhandle_p.h"
 #include "hbstyleoptionslider_p.h"
 #include "hbslidertickmarkslabel_p.h"
-#include "hbslidertickmarkslabel_p.h"
 #include <hbstyle.h>
 #include <hbinstance.h>
 #include <hbtheme.h>
 #include <hbtooltip.h>
 #include <hbwidgetfeedback.h>
 void HbSliderControlPrivate::init( )
 {
 Q_Q( HbSliderControl );
 q->enableTrackEventHandling( true );
-#ifdef HB_GESTURE_FW
-q->grabGesture(Qt::TapGesture);
-q->grabGesture(Qt::PanGesture,Qt::ReceivePartialGestures);
-q->setFiltersChildEvents(true) ;
-#endif
 // creating handle
 handle = createHandle();
 if(handle) {
 HbStyle::setItemName( handle, "handle" );
 }
 q->setFocusPolicy( Qt::FocusPolicy( ( qApp->style( ) )->styleHint( QStyle::SH_Button_FocusPolicy ) ) );
-//creating groove
 groove = createGroove();
 if(groove) {
 HbStyle::setItemName( groove, "groove" );
 }
+#ifdef HB_GESTURE_FW
+q->setFiltersChildEvents(true) ;
+#endif
 //filled item top of groove
 if ( enableProgressTrack ) {
 progressGroove = createProgressGroove();
 if(progressGroove) {
 HbStyle::setItemName( progressGroove, "progressgroove");
 /*!
 \internal
-This is used to create the handle, is virtual and can be overridden to create different handle.
+This is used to create the handle, it is virtual and can be overridden to create different handle.
 */
 HbSliderHandle *HbSliderControlPrivate::createHandle()
 {
 Q_Q( HbSliderControl );
 HbSliderHandle *handle = new HbSliderHandle( q );
 return handle;
 }
 /*!
 \internal
-This is used to create the groove. can be overrideen by derived class
+This is used to create the groove.It can be overrideen by derived class
 */
 QGraphicsItem *HbSliderControlPrivate::createGroove()
 {
 Q_Q( HbSliderControl );
 QGraphicsItem *groove = qgraphicsitem_cast<QGraphicsItem*>( q->style( )->createPrimitive(
 HbStyle::P_Slider_groove, q ) );
 return groove;
 }
 /*!
 \internal
-This is used to create the masked progress groove. can be overrideen by derived class
+This is used to create the masked progress groove.This can be overrideen by derived class
 */
 QGraphicsItem *HbSliderControlPrivate::createProgressGroove()
 {
 Q_Q( HbSliderControl );
 QGraphicsItem *proggroove = qgraphicsitem_cast<QGraphicsItem*>( q->style( )->createPrimitive(
 q->style( )->updatePrimitive( progressGroove, HbStyle::P_Slider_progressgroove, &opt );
 }
 }
 /*!
-This api returns true if pos in on handle rect
+This api returns true if pos in on handle boundingRect
 */
 bool HbSliderControlPrivate::onHandle( QPointF pos )
 {
 Q_Q( HbSliderControl );
 QRectF handleRect = handle->touchItem->sceneBoundingRect( );
 case 3: If some tickmarkitems to be drawn without labelItem in the middle,
 specify empty string ( "" ) for that item  in the string list.
 case 4: if both major & minor tickinterval are same,then only majortickLabel
-strings are taken into account for drawing the labelItem
+strings are taken into account for drawing the labelItem.
+case 5: If you want to remove the majorticklabel from the slider, pass the empty
+stringlist as the argument
 \sa majorTickLabels( )
 */
 void HbSliderControl::setMajorTickLabels( const QStringList &majorTickLabels )
 {
 }
 }
 }
 /*!
-This will enable/disable current value diplay as tooltip
+This will enable/disable current value display as tooltip
 on thumb drag
 */
 void HbSliderControl::setToolTipVisible( bool value )
 {
 Q_D( HbSliderControl );
 // calculate pixel value for event position
 int pressValue = QStyle::sliderValueFromPosition( opt.minimum, opt.maximum,
 static_cast<int>( handlePos ),static_cast<int>( span ),opt.upsideDown );
 //update the groove and touch item
 style( )->updatePrimitive( d->groove, HbStyle::P_Slider_groove, &opt );
-// if default is set then dont increment or decrement slider value
+// if default is set then do not increment or decrement slider value
 // just set default value to slider
 if ( d->setDefault ) {
 setValue( d->previousValue );
 if ( pressValue > value( ) ) {
 setRepeatAction( SliderSingleStepAdd, pressValue );
 #else
 Q_UNUSED(event);
 #endif
 }
+/*!
+reimp
+*/
 #ifdef HB_GESTURE_FW
 void HbSliderControl::gestureEvent(QGestureEvent *event)
 {
 Q_D(HbSliderControl);
 if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
 int pressValue = QStyle::sliderValueFromPosition( opt.minimum, opt.maximum,
 static_cast<int>( handlePos ),static_cast<int>( span ),opt.upsideDown );
-// if default is set then dont increment or decrement slider value
+// if default is set then don't increment or decrement slider value
 // just set default value to slider
 setSliderPosition( pressValue );
 triggerAction( SliderMove );
 setRepeatAction( SliderNoAction, pressValue );
 HbWidgetFeedback::triggered( this, Hb::InstantReleased );
 if (HbPanGesture *panGesture = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
 switch(panGesture->state( )) {
 case Qt::GestureStarted:
 case Qt::GestureUpdated:{
 QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) );
+				//if the position is on thumb , then start moving the thumb
 if( ( d->onHandle( startPoint) && d->grooveTouchArea->sceneBoundingRect( ).contains( startPoint))||isSliderDown( ) ) {
 qreal handlePos = 0;
 qreal span = 0;
 QRectF bounds = boundingRect( );
 QRectF handleBounds = d->handle->boundingRect( );
 setSliderDown( false );
 d->groovePressed = false;
 updatePrimitives( );
 d->handle->updatePrimitives();
 d->handleMoving = false;
+				int pressValue = sliderPosition();
+setRepeatAction( SliderNoAction,static_cast<int>( pressValue ) );
 event->ignore();
 HbAbstractSliderControl::gestureEvent(event);
 }
 break;
 default:
 option->handleRect = d->handle->boundingRect( );
 QRectF bounds = boundingRect( );
 QRectF handleBounds = d->handle->boundingRect( );
 qreal span = 0;
 if ( orientation( ) == Qt::Horizontal ) {
-bounds.adjust( 0, 0, -handleBounds.width( )/2, 0 );
+bounds.adjust( 0, 0, -handleBounds.width( ), 0 );
 // calculating span
 span = bounds.width( );
 } else {
-bounds.adjust( 0, 0, 0, -handleBounds.height( )/2 );
+bounds.adjust( 0, 0, 0, -handleBounds.height( ) );
 // calculating span
 span = bounds.height( );
 }
 option->span = span;
 }
 HbAbstractSliderControl::setSliderPosition( value );
 d->displayCurrValueToolTip =  b;
 }
 /*!
-snapp slider values
+snap to slider values
 */
 void HbSliderControl::updateSliderPosToTick( )
 {
 Q_D( HbSliderControl );
 int nearbyTick = d->getNearbyTick( );
 #ifdef HB_GESTURE_FW
 ungrabGesture(Qt::TapGesture);
 ungrabGesture(Qt::PanGesture);
 touchArea->grabGesture(Qt::TapGesture);
-touchArea->grabGesture(Qt::PanGesture,Qt::ReceivePartialGestures);
+touchArea->grabGesture(Qt::PanGesture);
 #endif
 }
 }
 d->trackHandlingEnable = enable ;
 }
 {
 Q_D( HbSliderControl );
 return d->handle->size( ) ;
 }
+/*!
+fills the track upto the current value if \a trackVisible is true
+*/
 void HbSliderControl::setTrackFilled(bool trackVisible )
 {
 Q_D( HbSliderControl );
 }
 }
 }
+/*!
+Returns whether the track is filled upto the current value or not
+*/
 bool HbSliderControl::isTrackFilled() const
 {
 Q_D( const HbSliderControl );
 return d->enableProgressTrack;
 }

changeset 6	c3690ec91ef8
parent 3	11d3954df52a
child 7	923ff622b8b9