diff -r e48454f237ca -r 49c70dcc3f17 ganeswidgets/inc/HgContainer.h --- a/ganeswidgets/inc/HgContainer.h Mon May 03 13:32:54 2010 +0300 +++ b/ganeswidgets/inc/HgContainer.h Fri May 14 16:57:01 2010 +0300 @@ -103,6 +103,11 @@ void scrollingStarted(); void scrollingEnded(); +protected slots: + + virtual void onScrollingStarted(); + virtual void onScrollingEnded(); + private slots: void updateBySpringPosition(); @@ -136,7 +141,6 @@ virtual void handleLongTapAction(const QPointF& pos, HgWidgetItem* hitItem, int hitItemIndex); virtual void onScrollPositionChanged(qreal pos); virtual void handleCurrentChanged(const QModelIndex ¤t); - virtual QRectF drawableRect() const; protected: @@ -158,7 +162,7 @@ bool handleLongTap(Qt::GestureState state, const QPointF &pos); bool handleItemAction(const QPointF &pos, ItemActionType action); - void selectItem(); + void selectItem(int index); void updateSelectedItem(); void unselectItem(); @@ -168,8 +172,6 @@ void stopLongPressWatcher(); bool updateSelectionModel(HgWidgetItem* item); - QTransform qtToVgTransform() const; - QPointF mapQtToVg(const QPointF& p) const; virtual void updateItemSizeAndSpacing(); virtual QSizeF getAutoItemSize() const; @@ -196,7 +198,8 @@ HgWidget::SelectionMode mSelectionMode; QItemSelectionModel *mSelectionModel; - HgImage *mMarkImage; + HgImage *mMarkImageOn; + HgImage *mMarkImageOff; qreal mSpringVelAtDragStart; bool mDragged; @@ -219,6 +222,8 @@ QSizeF mUserItemSpacing; Qt::Orientation mOrientation; + QModelIndex mDelayedScrollToIndex; + bool mIgnoreTap; }; #endif