FCL/sf/mw/hb: comparison src/hbwidgets/itemviews/hblistview.cpp

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include "hblistlayout_p.h"
 #include "hblistviewitem.h"
 #include "hblistitemcontainer_p.h"
 #include "hblistitemcontainer_p.h"
-#include "hbgesturefilter.h"
 #include "hbscrollbar.h"
 #include <hbwidgetfeedback.h>
 #include "hbmodeliterator.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsScene>
 #include <QAbstractItemModel>
+#include <QPanGesture>
 #include <qdebug.h>
 /*!
 @beta
 @hbwidgets
 View item layout configuration happens from HbListViewItem prototype that can be accesses with HbListViewItem::listItemPrototype function.
 More information about this can be found from HbListViewItem documentation.
 */
-static const qreal DRAGGED_ITEM_SCROLL_SPEED = 0.2;
-static const int FLICKMINDISTANCE = 50;
-static const qreal FLICK_TIMEOUT = 200;
-static const qreal SCROLLSPEED_FACTOR = 0.0004;
 /*!
 Constructs a list view with \a parent.
 */
 HbListView::HbListView(QGraphicsItem *parent)
 //If item is in the buffer, just reveal it.
 //This is always the case if recycling is off
 //and sometimes the case when recycling is on
 if (itemRecycling()) {
-if (!   (    d->mContainer->itemByIndex(index)
+if (    !d->mContainer->itemByIndex(index)
-&&  (   hint == PositionAtTop
+||  hint != EnsureVisible) {
-||  hint == EnsureVisible))) {
 //Now the item is not in the buffer.
 //We must first set the item to be in the buffer
 //If the item is above let's put it first and if it is below put it last
 int newIndex = -1;
 switch (hint) {
 if (d->mSelectionMode != HbAbstractItemView::NoSelection
 || !d->mModelIterator->model()
 || !(d->mModelIterator->model()->supportedDropActions().testFlag(Qt::MoveAction))) {
 return false;
 }
-if (d->mGestureFilter) {
-removeSceneEventFilter(d->mGestureFilter);
-d->mFilterRemoved = true;
-}
 verticalScrollBar()->setInteractive(true);
 } else {
-if (d->mFilterRemoved) {
-installSceneEventFilter(d->mGestureFilter);
-d->mFilterRemoved = false;
-}
 verticalScrollBar()->setInteractive(false);
 }
 d->mArrangeMode = arrangeMode;
 d->mAnimateItems = !d->mArrangeMode;
+if (d->mArrangeMode == true) {
+d->mOriginalFriction = d->mFrictionEnabled;
+setFrictionEnabled(false);
+} else {
+setFrictionEnabled(d->mOriginalFriction);
+}
 }
 return true;
 }
-/*!
-\reimp
-*/
-void HbListView::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-Q_D(HbListView);
-if (d->mArrangeMode
-&& d->mSelectionMode == HbAbstractItemView::NoSelection
-&& !d->mDraggedItem) {
-if (d->mFilterRemoved == false && d->mGestureFilter) {
-removeSceneEventFilter(d->mGestureFilter);
-d->mFilterRemoved = true;
-}
-d->mDraggedItem = d->itemAt(event->scenePos());
-if(d->mDraggedItem) {
-d->mDraggedItemIndex = d->mDraggedItem->modelIndex();
-if (d->mDraggedItemIndex.isValid()) {
-setCurrentIndex(d->mDraggedItemIndex);
-d->mMousePressTimer.restart();
-d->mMousePressPos = event->scenePos();
-d->mOriginalTransform = d->mDraggedItem->transform();
-d->mDraggedItem->setZValue(d->mDraggedItem->zValue() + 1);
-d->mDraggedItem->setPressed(true);
-connect(this, SIGNAL(scrollPositionChanged(QPointF)), this, SLOT(scrolling(QPointF)));
-Hb::InteractionModifiers modifiers = 0;
-if (d->mWasScrolling) {
-modifiers |= Hb::ModifierScrolling;
-}
-HbWidgetFeedback::triggered(d->mDraggedItem,Hb::InstantPressed,modifiers);
-} else {
-d->mDraggedItem = 0;
-}
-}
-} else {
-if (!d->mDraggedItem) {
-HbAbstractItemView::mousePressEvent(event);
-}
-}
-}
-/*!
-\reimp
-*/
-void HbListView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-Q_D(HbListView);
-if (d->mArrangeMode
-&& d->mSelectionMode == HbAbstractItemView::NoSelection
-&& d->mDraggedItem) {
-if (!isScrolling()) {
-// move the item with the cursor to indicate the move
-d->mDraggedItem->translate(0, event->scenePos().y() - event->lastScenePos().y());
-if (d->mMousePressTimer.elapsed() >= FLICK_TIMEOUT) {
-d->moveDraggedItemTo(event->scenePos());
-}
-}
-// in case we are "dragging" an item and at the top/bottom of
-// the view the view is scrolled to reveal more items in
-// that direction
-QModelIndex firstVisible;
-QModelIndex lastVisible;
-d->mContainer->firstAndLastVisibleModelIndex(firstVisible, lastVisible);
-if (firstVisible.isValid() && lastVisible.isValid()) {
-// above indexes are valid so container contain at least one item - so it is
-// safe to call first and last
-QModelIndex firstItemIndex = d->mContainer->items().first()->modelIndex();
-QModelIndex lastItemIndex = d->mContainer->items().last()->modelIndex();
-// If the item is dragged up in the list (and there are more items to show), scroll up
-if (!isScrolling()
-&& !isVisible(firstItemIndex)
-&& event->scenePos().y() < d->mMousePressPos.y()
-&& event->pos().y() < itemByIndex(firstVisible)->size().height()) {
-d->mScrollStartMousePos = event->scenePos();
-d->mLastScrollPos = QPointF(0,0);
-d->animateScroll(QPointF(0.0f , DRAGGED_ITEM_SCROLL_SPEED));
-}
-// If the item is dragged down in the list (and there are more items to show), scroll down
-else if (!isScrolling()
-&& !isVisible(lastItemIndex)
-&& event->scenePos().y() > d->mMousePressPos.y()
-&& event->pos().y() > (size().height() - itemByIndex(lastVisible)->size().height())) {
-d->mScrollStartMousePos = event->scenePos();
-d->mLastScrollPos = QPointF(0,0);
-d->animateScroll(QPointF(0.0f , (-1 * DRAGGED_ITEM_SCROLL_SPEED)));
-}
-// If the view is scrolling and the drag event is inside the view, we need to stop the scrolling
-else if (event->pos().y() < (size().height() - itemByIndex(lastVisible)->size().height())
-&& event->pos().y() > itemByIndex(firstVisible)->size().height()
-&& isScrolling()) {
-d->stopAnimating();
-}
-}
-} else {
-HbAbstractItemView::mouseMoveEvent(event);
-}
-}
 /*!
 This slot is called when the arrangeMode is true, user is dragging an item
 and the underlying scrollarea is moving.
-*/void HbListView::scrolling(QPointF newPosition)
+*/
+void HbListView::scrolling(QPointF newPosition)
 {
 Q_UNUSED(newPosition);
 Q_D(HbListView);
 if (d->mArrangeMode
 d->moveDraggedItemTo(d->mScrollStartMousePos);
 if (d->mDraggedItem) {
 d->mDraggedItem->translate(delta.x(), delta.y());
 }
-}
-}
-/*!
-\reimp
-*/
-void HbListView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-Q_D(HbListView);
-if (d->mArrangeMode
-&& d->mSelectionMode == HbAbstractItemView::NoSelection
-&& d->mDraggedItem) {
-disconnect(this, SIGNAL(scrollPositionChanged(QPointF)), this, SLOT(scrolling(QPointF)));
-if (isScrolling()) {
-d->stopAnimating();
-}
-// remove item's drag indications
-d->mDraggedItem->setOpacity(1.0);
-d->mDraggedItem->setTransform(d->mOriginalTransform);
-d->mDraggedItem->setZValue(d->mDraggedItem->zValue() - 1);
-d->mDraggedItem->setPressed(false);
-if (d->itemAt(event->scenePos())) {
-int downTime = d->mMousePressTimer.elapsed();
-// this seems to be a flick rather than item move, so start
-// scrolling
-qreal distance = event->scenePos().y() - d->mMousePressPos.y();
-if (downTime > 0 && downTime < FLICK_TIMEOUT
-&& qAbs(distance) > FLICKMINDISTANCE ) {
-d->animateScroll(QPointF (0.0f, (distance * 1000 / downTime) * SCROLLSPEED_FACTOR));
-}
-}
-Hb::InteractionModifiers modifiers = 0;
-if (d->mWasScrolling) {
-modifiers |= Hb::ModifierScrolling;
-}
-HbWidgetFeedback::triggered(d->mDraggedItem,Hb::InstantReleased,modifiers);
-d->mDraggedItem = 0;
-} else {
-HbAbstractItemView::mouseReleaseEvent(event);
 }
 }
 /*!
 Moves the item in row \a from to row \a to.
 {
 Q_D(HbListView);
 if (parent == d->mModelIterator->rootIndex()) {
 HbAbstractItemView::rowsInserted(parent, start, end);
-bool animate = d->mEnabledAnimations & HbAbstractItemView::Appear ? d->mAnimateItems : false;
+if (!d->mArrangeMode && d->animationEnabled(true)) {
-if (!d->mArrangeMode && animate) {
+d->startAppearEffect("viewitem", "appear", parent, start, end);
-d->startAppearEffect(parent, start, end);
 }
 }
 }
 /*!
 HbAbstractViewItem* item = viewItem(i);
 if (item) {
 if (d->mDraggedItem == item) {
 d->mDraggedItem = 0;
 }
-bool animate = d->mEnabledAnimations & HbAbstractItemView::Disappear ? d->mAnimateItems : false;
-if (!d->mArrangeMode && animate) {
+if (!d->mArrangeMode && d->animationEnabled(false)) {
 d->mItemsAboutToBeDeleted.append(item);
 }
 }
 }
 }
 void HbListView::rowsRemoved(const QModelIndex &parent, int start, int end)
 {
 Q_D(HbListView);
 if (parent == d->mModelIterator->rootIndex()) {
-bool animate = d->mEnabledAnimations & HbAbstractItemView::Disappear ? d->mAnimateItems: false;
+if (d->animationEnabled(false)) {
-if (animate) {
 for (int i = 0; i < d->mItemsAboutToBeDeleted.count(); i++) {
-HbEffect::start(d->mItemsAboutToBeDeleted.at(i),
+QGraphicsItem *item = d->mItemsAboutToBeDeleted.at(i);
+HbEffect::cancel(item, "appear");
+item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+HbEffect::start(item,
 "viewitem",
 "disappear",
 d->mContainer,
 "animationFinished");
 }
 d->mItemsAboutToBeDeleted.clear();
 }
 HbAbstractItemView::rowsRemoved(parent, start, end);
 }

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9