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

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include "hbscrollarea.h"
 #include "hbscrollarea_p.h"
 #include "hbscrollbar.h"
 #include "hbdeviceprofile.h"
+#include "hbinstance.h"
 #include <hbwidgetfeedback.h>
 #include <hbevent.h>
+#include "hbglobal_p.h"
+#include <QGesture>
 #include <QDebug>
 /*!
-*  @stable
+*  @beta
 *  @hbcore
 *  \class HbScrollArea
 *  \brief HbScrollArea provides a finger-touch enabled scrollable container class.
 *
 *  HbScrollArea handles the events need to scroll the contents placed inside it.  It also
 This signal is emitted when scrolling direction is changed.
 */
 /*!
-\fn void HbScrollArea::gestureSceneFilterChanged(HbGestureSceneFilter* newFilter)
-This signal is emitted when gesture filters are changed.
-*/
-/*!
 \fn void HbScrollArea::scrollingStarted()
 This signal is emitted whenever a scrolling action begins.
 */
 *
 * \sa HbScrollArea::~HbScrollArea
 */
 HbScrollArea::~HbScrollArea()
 {
+Q_D( HbScrollArea );
+if (d && d->mContents) {
+d->mContents->setParentLayoutItem(0);
+}
 }
 /*!
 * Returns a pointer to the QGraphicsWidget,which is the content of scrollable area.
 *
 }
 d->stopAnimating();
 if (0 != d->mContents) {
+d->mContents->setParentLayoutItem(0);
 delete d->mContents;
 }
 d->mContents = contents;
 updateGeometry();
 if (0 != contents) {
+contents->setParentLayoutItem(this);
 contents->setParentItem(this);
 contents->installEventFilter(this);
+d->mResetAlignment = true;
 d->adjustContent();
 setContinuationIndicators(d->mContinuationIndicators);
 } else {
 d->hideChildComponents();
 }
 QGraphicsWidget* content = d->mContents;
 d->mContents = 0;
 // Reset the ownership
 if (content) {
+content->setParentLayoutItem(0);
 content->setParentItem(0);
 content->removeEventFilter(this);
 }
 d->hideChildComponents();
 return d->mScrollingStyle;
 }
 /*!
-* Sets the scrollingStyle property that controls how the style of scrolling interaction
+Sets the scrollingStyle property that controls how the style of scrolling interaction
-* provided by the widget
+provided by the widget
-*
-* Possible values for the clamping style include:
+Possible values for the clamping style include:
-*
-*		Pan - dragging motion pans the view with no follow-on scrolling animation
+		Pan - dragging motion pans the view with no follow-on scrolling animation
-*		PanOrFlick - dragging motion pans the view with no follow-on scrolling animation, quick flicking motion triggers scrolling animation
+\deprecated PanOrFlick
-*		PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling
+is deprecated.
-*
+		PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling
-* The default value is PanWithFollowOn.
-*
+The default value is PanWithFollowOn.
-* \sa HbScrollArea::scrollingStyle()
+\sa HbScrollArea::scrollingStyle()
 */
 void HbScrollArea::setScrollingStyle(ScrollingStyle value)
 {
 Q_D( HbScrollArea );
-bool isChanged = (d->mScrollingStyle != value);
+if (value == HbScrollArea::PanOrFlick) {
+d->mScrollingStyle = HbScrollArea::PanWithFollowOn;
-d->mScrollingStyle = value;
+HB_DEPRECATED("HbScrollArea::PanOrFlick is deprecated");
+} else {
-if (isChanged) {
+d->mScrollingStyle = value;
-d->updateGestures();
-emit gestureSceneFilterChanged( d->mGestureFilter );
 }
 }
 /*!
 * Returns the value of the scrollDirections property.
 bool isChanged = (d->mScrollDirections != value);
 d->mScrollDirections = value;
 if (isChanged) {
-d->updateGestures();
 emit scrollDirectionsChanged( value );
-emit gestureSceneFilterChanged( d->mGestureFilter );
 }
 }
 /*!
 * Returns true if the inertia scrolling effect is enabled, false otherwise.
 d->mFrictionEnabled = value;
 }
 /*!
-* Returns true if the scroll area handles
+Returns true if the scroll area handles
-* long press gestures, false otherwise
+long press gestures, false otherwise
-*
-* \sa HbScrollArea::setHandleLongPress()
+\deprecated HbScrollArea::longPressEnabled()
+is deprecated.
+\sa HbScrollArea::setHandleLongPress()
 */
 bool HbScrollArea::longPressEnabled() const
 {
-Q_D( const HbScrollArea );
+HB_DEPRECATED("HbScrollArea::longPressEnabled() is deprecated");
+return false;
-return d->mHandleLongPress;
+}
-}
+/*!
-/*!
+Sets the value of the handleLongPress property.  This value is set
-* Sets the value of the handleLongPress property.  This value is set
+to true if the widget is to respond to long press gestures, false otherwise.
-* to true if the widget is to respond to long press gestures, false otherwise.
-*
+The default value is false.
-* The default value is false.
-*
+\deprecated HbScrollArea::setLongPressEnabled(bool)
-* \sa HbScrollArea::handleLongPress()
+is deprecated.
+\sa HbScrollArea::handleLongPress()
 */
 void HbScrollArea::setLongPressEnabled (bool value)
 {
-Q_D( HbScrollArea );
+HB_DEPRECATED("HbScrollArea::setLongPressEnabled(bool) is deprecated");
+Q_UNUSED(value);
-bool isChanged = (d->mHandleLongPress != value);
-d->mHandleLongPress = value;
-if (isChanged) {
-d->updateGestures();
-emit gestureSceneFilterChanged( d->mGestureFilter );
-}
 }
 /*
 * \reimp
 */
 QVariant HbScrollArea::itemChange(GraphicsItemChange change, const QVariant &value)
 {
 Q_D( HbScrollArea );
-// ??? need to support other changes ???
+if (change == QGraphicsItem::ItemVisibleHasChanged && d->mContents) {
-if ( change == QGraphicsItem::ItemSceneHasChanged ) {
-d->updateGestures();
-emit gestureSceneFilterChanged( d->mGestureFilter );
-} else if (change == QGraphicsItem::ItemVisibleHasChanged && d->mContents) {
 if (value.toBool() == true)
 d->adjustContent();
 else
 d->_q_hideScrollBars();
 }
 return HbWidget::itemChange(change, value);
 }
 /*! @beta
-* upGesture() is a virtual slot function that is called whenever an
+upGesture() is a virtual slot function that is called whenever an
-* up flick gesture is detected, if the scrollDirection is set to
+up flick gesture is detected, if the scrollDirection is set to
-* enable vertical scrolling.
+enable vertical scrolling.
-*
-* Derived classes can override this method to add custom handling of
+Derived classes can override this method to add custom handling of
-* the gesture.  In most cases, derived classes should call up to the
+the gesture.  In most cases, derived classes should call up to the
-* HbScrollArea parent method.
+HbScrollArea parent method.
-*
+\deprecated HbScrollArea::upGesture(int)
+is deprecated.
 */
 void HbScrollArea::upGesture(int speedPixelsPerSecond)
 {
-Q_D( HbScrollArea );
+HB_DEPRECATED("HbScrollArea::upGesture(int) is deprecated. Use gesture FW.");
-// convert the speedPixelsPerSecond to pixels per msec
+Q_UNUSED(speedPixelsPerSecond);
-QPointF speed;
-speed.setX(0.0f);
-speed.setY(-speedPixelsPerSecond * d->mSpeedFactor);
-d->animateScroll(speed);
 }
 /*! @beta
-* downGesture() is a virtual slot function that is called whenever an
+downGesture() is a virtual slot function that is called whenever an
-* down flick gesture is detected, if the scrollDirection is set to
+down flick gesture is detected, if the scrollDirection is set to
-* enable vertical scrolling.
+enable vertical scrolling.
-*
-* Derived classes can override this method to add custom handling of
+Derived classes can override this method to add custom handling of
-* the gesture.  In most cases, derived classes should call up to the
+the gesture.  In most cases, derived classes should call up to the
-* HbScrollArea parent method.
+HbScrollArea parent method.
+\deprecated HbScrollArea::downGesture(int)
+is deprecated.
 */
 void HbScrollArea::downGesture(int speedPixelsPerSecond)
 {
-Q_D( HbScrollArea );
+HB_DEPRECATED("HbScrollArea::downGesture(int) is deprecated. Use gesture FW.");
+Q_UNUSED(speedPixelsPerSecond);
-// convert the speedPixelsPerSecond to pixels per msec
-QPointF speed;
-speed.setX(0.0f);
-speed.setY(speedPixelsPerSecond * d->mSpeedFactor);
-d->animateScroll(speed);
 }
 /*! @beta
-* leftGesture() is a virtual slot function that is called whenever an
+leftGesture() is a virtual slot function that is called whenever an
-* left flick gesture is detected, if the scrollDirection is set to
+left flick gesture is detected, if the scrollDirection is set to
-* enable horizontal scrolling.
+enable horizontal scrolling.
-*
-* Derived classes can override this method to add custom handling of
+Derived classes can override this method to add custom handling of
-* the gesture.  In most cases, derived classes should call up to the
+the gesture.  In most cases, derived classes should call up to the
-* HbScrollArea parent method.
+HbScrollArea parent method.
+\deprecated HbScrollArea::leftGesture(int)
+is deprecated.
 */
 void HbScrollArea::leftGesture(int speedPixelsPerSecond)
 {
-Q_D( HbScrollArea );
+HB_DEPRECATED("HbScrollArea::leftGesture(int) is deprecated. Use gesture FW.");
+Q_UNUSED(speedPixelsPerSecond);
-// convert the speedPixelsPerSecond to pixels per msec
-QPointF speed;
-speed.setX(-speedPixelsPerSecond * d->mSpeedFactor);
-speed.setY(0.0f);
-d->animateScroll(speed);
 }
 /*! @beta
-* rightGesture() is a virtual slot function that is called whenever an
+rightGesture() is a virtual slot function that is called whenever an
-* right flick gesture is detected, if the scrollDirection is set to
+right flick gesture is detected, if the scrollDirection is set to
-* enable horizontal scrolling.
+enable horizontal scrolling.
-*
-* Derived classes can override this method to add custom handling of
+Derived classes can override this method to add custom handling of
-* the gesture.  In most cases, derived classes should call up to the
+the gesture.  In most cases, derived classes should call up to the
-* HbScrollArea parent method.
+HbScrollArea parent method.
+\deprecated HbScrollArea::rightGesture(int)
+is deprecated.
 */
 void HbScrollArea::rightGesture(int speedPixelsPerSecond)
 {
-Q_D( HbScrollArea );
+HB_DEPRECATED("HbScrollArea::rightGesture(int) is deprecated. Use gesture FW.");
+Q_UNUSED(speedPixelsPerSecond);
-// convert the speedPixelsPerSecond to pixels per msec
+}
-QPointF speed;
-speed.setX(speedPixelsPerSecond * d->mSpeedFactor);
-speed.setY(0.0f);
+/*!
-d->animateScroll(speed);
+panGesture() is a virtual slot function that is called whenever an
+pan gesture is detected.
+Derived classes can override this method to add custom handling of
+the gesture.  In most cases, derived classes should call up to the
+HbScrollArea parent method.
+\deprecated HbScrollArea::panGesture(const QPointF&)
+is deprecated.
+*/
+void HbScrollArea::panGesture(const QPointF &delta)
+{
+HB_DEPRECATED("HbScrollArea::panGesture(const QPointF &) is deprecated. Use gesture FW.");
+Q_UNUSED(delta);
 }
 /*!  @beta
-* panGesture() is a virtual slot function that is called whenever an
+longPressGesture() is a virtual slot function that is called whenever an
-* pan gesture is detected.
+long press gesture is detected, if the handleLongPress property is set to true.
-*
-* Derived classes can override this method to add custom handling of
+Derived classes can override this method to add custom handling of
-* the gesture.  In most cases, derived classes should call up to the
+the gesture.  By default, HbScrollArea does not respond to a long press.
-* HbScrollArea parent method.
-*/
+\deprecated HbScrollArea::longPressGesture(const QPointF&)
-void HbScrollArea::panGesture(const QPointF &delta)
+is deprecated.
-{
-Q_D( HbScrollArea );
+\sa setHandleLongPress(), handleLongPress()
-if ( d->mIsAnimating ) {
+*/
-d->stopAnimating();
+void HbScrollArea::longPressGesture(const QPointF &)
-}
+{
-if (scrollingStyle() == HbScrollArea::PanWithFollowOn) {
+HB_DEPRECATED("HbScrollArea::longPressGesture(const QPointF &) is deprecated. Use gesture FW.");
-d->addPositionToQueue(-delta, d->mDragElapsedTime.elapsed(), true);
-}
-if (d->mAbleToScrollY || d->mAbleToScrollX) {
-// initiate scroll feedback
-HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousScrolled, delta);
-d->mScrollFeedbackOngoing = true;
-}
-scrollByAmount(-delta);
-}
-/*!  @beta
-* longPressGesture() is a virtual slot function that is called whenever an
-* long press gesture is detected, if the handleLongPress property is set to true.
-*
-* Derived classes can override this method to add custom handling of
-* the gesture.  By default, HbScrollArea does not respond to a long press.
-*
-* \sa setHandleLongPress(), handleLongPress()
-*/
-void HbScrollArea::longPressGesture(const QPointF &/* point */)
-{
-//	qDebug() << "GOT LONG PRESS GESTURE" << point;
 }
 /*
 \reimp
 */
 void HbScrollArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-Q_D( HbScrollArea );
+Q_UNUSED (event);
-if (d->mContents) {
-d->mousePressEvent( event );
-}
-}
-/*
-\reimp
-*/
-void HbScrollArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-Q_D( HbScrollArea );
-if (d->mContents) {
-d->mouseReleaseEvent ( event );
-}
 }
 /*!
 * Returns true if a scrolling action is in progress, false otherwise.
 */
 {
 Q_D( HbScrollArea );
 return d->scrollByAmount(delta);
 }
-#if 0
-bool HbScrollArea::sceneEvent(QEvent *event)
-{
-Q_D( HbScrollArea );
-bool eventAccepted(false);
-eventAccepted = d->sceneEvent(event);
-if(!eventAccepted);
-eventAccepted = HbWidget::sceneEvent(event);
-return eventAccepted;
-}
-#endif // HB_NEW_GESTURE_FW
 /*!
 \reimp
 */
 bool HbScrollArea::event(QEvent *event)
 {
 if(event->type() == QEvent::ApplicationLayoutDirectionChange
 || event->type() == QEvent::LayoutDirectionChange) {
 d->changeLayoutDirection(layoutDirection());
 } else if (event->type() == QEvent::GraphicsSceneResize) {
 if (isVisible() && d->mContents) {
-d->orientationChanged();
+if ( d->mIsAnimating ) {
+d->stopAnimating();
+}
+d->adjustContent();
 }
 }  else if (event->type() == HbEvent::ChildFocusOut) {
 //qDebug() << "focusout";
 if ( !d->positionOutOfBounds() ) {
 d->stopAnimating();
+}
+} else if( event->type() == QEvent::GestureOverride ) {
+if(static_cast<QGestureEvent *>(event)->gesture(Qt::TapGesture) &&
+d->mIsAnimating && !d->positionOutOfBounds() && !d->mMultiFlickEnabled) {
+event->accept();
+return true;
+}
+} else if (event->type() == QEvent::LayoutRequest) {
+if (d->mContents) {
+if (preferredSize() != d->mContents->preferredSize()) {
+updateGeometry();
+}
+QSizeF newSize = d->mContents->size();
+QSizePolicy contentPolicy = d->mContents->sizePolicy();
+if (d->mScrollDirections & Qt::Vertical) {
+if (contentPolicy.verticalPolicy() != QSizePolicy::Ignored) {
+newSize.setHeight(d->mContents->preferredHeight());
+}
+} else {
+newSize.setHeight(size().height());
+}
+if (d->mScrollDirections & Qt::Horizontal) {
+if (contentPolicy.horizontalPolicy() != QSizePolicy::Ignored) {
+newSize.setWidth(d->mContents->preferredWidth());
+}
+} else {
+newSize.setWidth(size().width());
+}
+d->mContents->resize(newSize);
+}
+} else if (event->type() == QEvent::GraphicsSceneResize) {
+if (d->mContents) {
+QSizeF newSize = d->mContents->size();
+if (!(d->mScrollDirections & Qt::Vertical)) {
+newSize.setHeight(size().height());
+}
+if (!(d->mScrollDirections & Qt::Horizontal)) {
+newSize.setWidth(size().width());
+}
+d->mContents->resize(newSize);
 }
 }
 }
 return value;
 }
 d->stopAnimating();
 }
 }
+#ifdef HB_GESTURE_FW
+void HbScrollArea::gestureEvent(QGestureEvent *event)
+{
+Q_D ( HbScrollArea );
+if(QTapGesture *gesture = static_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
+// Stop scrolling on tap
+if (gesture->state() == Qt::GestureStarted) {
+if (d->mIsAnimating && !d->positionOutOfBounds() && !d->mMultiFlickEnabled) {
+d->stopAnimating();
+event->accept(gesture);
+} else {
+event->ignore(gesture);
+}
+}
+}
+if (QPanGesture *panGesture = qobject_cast<QPanGesture*>(event->gesture(Qt::PanGesture))) {
+if (!d->pan(panGesture)) {
+event->ignore(panGesture);
+} else {
+event->accept(panGesture);
+setFocus(Qt::MouseFocusReason);
+}
+}
+}
+#endif
 /*!
 Returns the scrollbar policy for vertical scrollbar
 \sa horizontalScrollBarPolicy(), setVerticalScrollBarPolicy()
 */
 void HbScrollArea::setAlignment(Qt::Alignment alignment)
 {
 Q_D(HbScrollArea);
 d->mAlignment = alignment;
+d->mResetAlignment = true;
 if (d->mContents)
 d->adjustContent();
 }
 /*!
 \brief the alignment of the scroll area's widget
 Q_D(HbScrollArea);
 if (time > 0){
 d->startTargetAnimation (newPosition, qMax (0, time));
 } else {
 scrollByAmount(newPosition - (-d->mContents->pos()));
-if (d->positionOutOfBounds() && d->mClampingStyle == BounceBackClamping) {
+d->stopScrolling();
-d->startAnimating();
-} else {
-d->stopScrolling();
-}
 }
 }
 /*
 * \reimp

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9