FCL/sf/mw/hgwidgets: comparison ganeswidgets/src/hgcontainer.cpp

equal deleted inserted replaced

-:5ebec3429918
+:42505cd701c6
 HgWidgetItem* item = new HgWidgetItem(mQuadRenderer);
 mItems.append(item);
 }
 }
+// TODO: This does exactly the same as HgContainer::imageCount(), should this be thus removed?
 int HgContainer::itemCount() const
 {
 return mItems.count();
 }
 }
 // else do nothing
 scrollTo(mSelectionModel->currentIndex());
 }
+// TODO: This does exactly the same as HgContainer::itemCount(), should this be thus removed?
 int HgContainer::imageCount() const
 {
 return mItems.count();
 }
 void HgContainer::boundSpring()
 {
 FUNC_LOG;
 qreal x = mSpring.endPos().x();
-x = qBound(qreal(0), x, worldWidth());
 if (mRenderer->coverflowModeEnabled()) {
 qreal i = floorf(x);
 x = (x - i > 0.5f) ? ceilf(x) : i;
-mSpring.animateToPos(QPointF(x, 0));
+}
-}
+mSpring.animateToPosAfterPanning(QPointF(x, 0), worldWidth());
-mSpring.animateToPos(QPointF(x, 0));
 }
 bool HgContainer::handlePanning(QPanGesture *gesture)
 {
 else if (mDragged && gesture->state() == Qt::GestureFinished) {
 mDrag.update(delta, pos, itemSide);
 mDragged = false;
 qreal newPos(0);
 if (mDrag.finish(pos, mRenderer->coverflowModeEnabled(), newPos)) {
-mSpring.animateToPos(QPointF(qBound(qreal(0), newPos, worldWidth()), 0));
+mSpring.animateToPosAfterPanning(QPointF(newPos, 0), worldWidth());
 HgWidgetItem* item = itemByIndex(newPos);
 if (item && item->modelIndex() != mSelectionModel->currentIndex()) {
 //    mSelectionModel->setCurrentIndex(item->modelIndex(), QItemSelectionModel::Current);
 }
 }
 bool HgContainer::handleTap(Qt::GestureState state, const QPointF &pos)
 {
 FUNC_LOG;
 bool handleGesture = false;
 if (hasItemAt(pos)) {
 switch (state)
 {
 case Qt::GestureStarted:
 {
 if (mRenderer->coverflowModeEnabled() || !mSpring.isActive()) {
 mIgnoreGestureAction = false;
 startLongPressWatcher(pos);
 } else if(mSpring.isActive()) {
-mSpring.cancel();
+int rowCount = mRenderer->getRowCount();
+if(rowCount != 0)   //just in case, should not be zero
+{
+qreal springPos = mSpring.pos().x();
+int gridTotalHeightInImages = ceilf( mItems.count() / rowCount );
+qreal currentViewHeightInImages;
+if (scrollDirection() == Qt::Horizontal ) {
+int rowHeight = mRenderer->getImageSize().width() + mRenderer->getSpacing().width();
+currentViewHeightInImages = rect().width() / rowHeight;
+} else {
+int rowHeight = mRenderer->getImageSize().height() + mRenderer->getSpacing().height();
+currentViewHeightInImages = rect().height() / rowHeight;
+}
+// If list does not currently fill the whole screen (some theme background behind the list
+// is visible), and list is moving, then do not react to tapping.
+if( springPos >= 0
+&& springPos <= (gridTotalHeightInImages - currentViewHeightInImages) )
+{
+mSpring.cancel();
+}
+}
 mIgnoreGestureAction = true;
 }
 break;
 }
 case Qt::GestureFinished:
 break;
 }
 handleGesture = true;
 } else {
 mIgnoreGestureAction = true;
 }
 return handleGesture;
 }
 bool HgContainer::handleLongTap(Qt::GestureState state, const QPointF &pos)

changeset 11	42505cd701c6
parent 6	1cdcc61142d2
child 12	6c0ec0ccd2d4