FCL/sf/mw/hgwidgets: comparison ganeswidgets/src/hgwidgets

equal deleted inserted replaced

-:463f1934e292
+:c348b9772569
 *
 * Description:
 *
 */
-#include <QGraphicsLinearLayout>
 #include <QApplication>
 #include <hbscrollbar_p.h>
 #include <hgwidgets/hgwidgets.h>
 #include "hgwidgets_p.h"
 #include "hgwidgetitem.h"
 #include "trace.h"
 //#include "hgindexfeedback.h"
 static const int INITIAL_SCROLLBAR_HIDE_TIMEOUT(4000);
-static const int DEFAULT_BUFFER_SIZE(30);
+static const int DEFAULT_BUFFER_SIZE(25);
 HgWidgetPrivate::HgWidgetPrivate() :
-mLayout(0),
 mContainer(0),
 mBufferManager(0),
 mModel(0),
-mSelectionModel(0),
 mDefaultSelectionModel(0),
 mScrollBar(0),
 mAbleToScroll(false),
 mHandleLongPress(false),
 mBufferSize(DEFAULT_BUFFER_SIZE),
 q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 q->setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
 q->setFocusPolicy(Qt::StrongFocus);
 createScrollBar(container->scrollDirection());
 //QObject::connect(&(mScrollBarHideTimer), SIGNAL(timeout()), q, SLOT(_q_hideScrollBars()));
 mContainer = container;
 mScrollBarPolicy = HgWidget::ScrollBarAutoHide;
 q->connect(mContainer, SIGNAL(longPressed(const QModelIndex&, const QPointF &)),
 q, SIGNAL(longPressed(const QModelIndex&, const QPointF &)));
 q->connect(mContainer, SIGNAL(scrollingStarted()), q, SIGNAL(scrollingStarted()));
 q->connect(mContainer, SIGNAL(scrollingEnded()), q, SIGNAL(scrollingEnded()));
 q->connect(mScrollBarHideTimer, SIGNAL(timeout()), q, SLOT(_q_hideScrollBars()));
 //    mIndexFeedback = new HgIndexFeedback(q);
 //    mIndexFeedback->setWidget(q);
 }
 void HgWidgetPrivate::setModel( QAbstractItemModel *model )
 {
 FUNC_LOG;
 }
 void HgWidgetPrivate::setSelectionModel(QItemSelectionModel *selectionModel)
 {
 FUNC_LOG;
 Q_Q(HgWidget);
 if (mContainer) {
+if (mContainer->selectionModel()) {
+q->disconnect(mContainer->selectionModel(),
+SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+q,
+SLOT(_q_updateCurrentItem(QModelIndex, QModelIndex)));
+}
+QModelIndex defaultItem;
+if (mModel && mModel->rowCount() > 0) {
+defaultItem = mModel->index(0, 0);
+}
 if (selectionModel == 0) {
 QItemSelectionModel *oldSelectionModel = mDefaultSelectionModel;
 mDefaultSelectionModel = 0;
 mDefaultSelectionModel = new QItemSelectionModel(mModel);
-mContainer->setSelectionModel(mDefaultSelectionModel);
+q->connect(mDefaultSelectionModel,
+SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+SLOT(_q_updateCurrentItem(QModelIndex, QModelIndex)));
+mContainer->setSelectionModel(mDefaultSelectionModel, defaultItem);
 delete oldSelectionModel;
 }
 else if (selectionModel != mContainer->selectionModel()) {
 QItemSelectionModel *oldSelectionModel = mDefaultSelectionModel;
 mDefaultSelectionModel = 0;
-mContainer->setSelectionModel(selectionModel);
+q->connect(selectionModel,
+SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+SLOT(_q_updateCurrentItem(QModelIndex, QModelIndex)));
+mContainer->setSelectionModel(selectionModel, defaultItem);
 delete oldSelectionModel;
 }
 if (mContainer->selectionModel()) {
 //            if (mIndexFeedback) {
 //                delete mIndexFeedback;
 //                mIndexFeedback = 0;
 //            }
 //            mIndexFeedback = new HgIndexFeedback(q);
 //            mIndexFeedback->setWidget(q);
-}
+}
 }
 }
 QItemSelectionModel *HgWidgetPrivate::selectionModel() const
 {
 q->connect(mModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
 SLOT(_q_removeRows(QModelIndex, int, int)));
 q->connect(mModel, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)),
 SLOT(_q_moveRows(QModelIndex, int, int, QModelIndex, int)));
 q->connect(mModel, SIGNAL(modelReset()),SLOT(_q_modelReset()));
 mContainer->setItemCount(mModel->rowCount(QModelIndex()));
 QList<HgWidgetItem*> items = mContainer->items();
 // set model indexes for the items firsts
 const int itemCount = items.count();
 {
 items.at(i)->setModelIndex(mModel->index(i, 0, QModelIndex()));
 }
 initBufferManager(itemCount);
 setSelectionModel(0); // Default
-if (mModel->rowCount() > 0)
-{
-setCurrentIndex(mModel->index(0, 0));
-scrollTo(mModel->index(0, 0));
-}
 }
 }
 void HgWidgetPrivate::clearCurrentModel()
 {
 // notify container which items have updated data available.
 // container is responsible to redraw view if some of the items
 // is visible.
 if (firstUpdated != -1 && lastUpdated != -1) {
 mContainer->itemDataChanged(firstUpdated, lastUpdated);
-}
+// if item data for current has changed we need to update current.
+if (mContainer->selectionModel()) {
+QModelIndex currentIndex = mContainer->selectionModel()->currentIndex();
+if (currentIndex.isValid() &&
+currentIndex.row() >= firstUpdated &&
+currentIndex.row() <= lastUpdated) {
+updateCurrentItem(currentIndex);
+}
+}
+}
 }
 void HgWidgetPrivate::_q_scrollPositionChanged(qreal index,bool scrollBarAnimation)
 {
 int newPos = index;
 }
 }
 void HgWidgetPrivate::setScrollBarPolicy(HgWidget::ScrollBarPolicy policy)
 {
-mScrollBarPolicy = policy;
+Q_Q(HgWidget);
-if (mScrollBarPolicy == HgWidget::ScrollBarAlwaysOff &&
+if (mScrollBarPolicy != policy) {
-mScrollBar->isVisible()){
+mScrollBarPolicy = policy;
-mScrollBar->setVisible(false);
-}
+if (mScrollBarPolicy == HgWidget::ScrollBarAlwaysOff &&
+mScrollBar->isVisible()){
-if(policy != HgWidget::ScrollBarAlwaysOff){
+mScrollBar->setVisible(false);
-updateScrollMetrics();
+}
+if(policy != HgWidget::ScrollBarAlwaysOff){
+updateScrollMetrics();
+}
 }
 }
 void HgWidgetPrivate::_q_hideScrollBars()
 {
 // rows have been inserted to empty model. This is a special case
 // that reset function should handle.
 _q_modelReset();
 return;
 }
 mBufferManager->addItems(start, end);
 mContainer->addItems(start, end);
 // re-set model indexes for the items including and after the added indexes
 QList<HgWidgetItem *> items = mContainer->items();
 int newItemCount = items.count();
 for (int i = start; i < newItemCount; i++) {
 items.at(i)->setModelIndex(mModel->index(i, 0, QModelIndex()));
 }
 mBufferManager->flushRequestBuffers();
-if (oldItemCount == 0 && newItemCount > 0) {
-setCurrentIndex(mModel->index(0, 0));
-}
 q->update();
 }
 }
 void HgWidgetPrivate::_q_removeRows(const QModelIndex &parent, int start, int end)
 }
 }
 void HgWidgetPrivate::_q_modelReset()
 {
+FUNC_LOG;
 if (mContainer && mBufferManager) {
 const int oldItemCount = mContainer->itemCount();
 const int newItemCount = mModel->rowCount();
 if (newItemCount == oldItemCount) {
 // Model is reseted but itemcount is still the same.
 QList<HgWidgetItem*> items = mContainer->items();
 const int itemCount = items.count();
 for( int i=0; i<itemCount; i++) {
 items.at(i)->setModelIndex(mModel->index(i, 0, QModelIndex()));
 }
 // Buffermanager requests items to be updated.
 mBufferManager->resetBuffer(0, newItemCount);
-if (mModel->rowCount() > 0) {
+}
+// Update selection model's current.
+QItemSelectionModel *selectionModel = mContainer->selectionModel();
+if (mModel->rowCount() > 0) {
+if (selectionModel && selectionModel->currentIndex().isValid()) {
+scrollTo(selectionModel->currentIndex());
+}
+else {
 setCurrentIndex(mModel->index(0, 0));
 scrollTo(mModel->index(0, 0));
 }
 }
 }
 }
 void HgWidgetPrivate::setScrollBarMetrics(qreal pos)
 {
 prepareScrollBars( pos/worldSize );
 }
 void HgWidgetPrivate::adjustGeometry()
 {
-Q_Q(HgWidget);
+FUNC_LOG;
+Q_Q(HgWidget);
 QRectF scrollAreaBoundingRect = q->boundingRect();
 if( scrollAreaBoundingRect.isNull() ||
 !scrollAreaBoundingRect.isValid() ||
 !mContainer ||
 scrollAreaBoundingRect == mContainer->boundingRect() )
 void HgWidgetPrivate::lostForeground()
 {
 if( !mForeground ) return;
 mForeground = false;
 QList<HgWidgetItem*> list = mContainer->items();
 foreach(HgWidgetItem* item, list){
 item->releaseItemData();
 }
 }
 void HgWidgetPrivate::gainedForeground()
 {
 if( mForeground ) return;
 mForeground = true;
 QList<HgWidgetItem*> list = mContainer->items();
 int bufferStart = 0;
 int bufferEnd = 0;
 mBufferManager->currentBuffer(bufferStart,bufferEnd);
 for(;bufferStart<=bufferEnd;bufferStart++){
 list.at(bufferStart)->updateItemData();
 }
 }
+void HgWidgetPrivate::updateCurrentItem(const QModelIndex &currentItem)
+{
+Q_UNUSED(currentItem);
+// By default do nothing
+}
 bool HgWidgetPrivate::getItemOutline(const QModelIndex& index, QPolygonF& points)
 {
 return mContainer->getItemPoints(index.row(), points);
 }
 if (mContainer->orientation() != orientation) {
 mContainer->setOrientation(orientation, q->isVisible());
 if (!mStaticScrollDirection) {
 createScrollBar(orientation);
 }
-q->repolish();
 adjustGeometry();
 }
 }
 void HgWidgetPrivate::_q_groovePressed(qreal value, Qt::Orientation orientation)
 {
 Q_UNUSED(value);
 Q_UNUSED(orientation);
 }
+void HgWidgetPrivate::_q_updateCurrentItem(const QModelIndex &current, const QModelIndex &previous)
+{
+Q_UNUSED(previous);
+updateCurrentItem(current);
+}
 Qt::Orientation HgWidgetPrivate::scrollDirection() const
 {
 return mContainer->orientation();
 }
 void HgWidgetPrivate::createScrollBar(Qt::Orientation orientation)
 {
 Q_Q(HgWidget);
 delete mScrollBar;
 mScrollBar = 0;
 mScrollBar = new HbScrollBar(orientation,q);
 if (orientation == Qt::Vertical) {
 HbStyle::setItemName(mScrollBar, "scrollbar-vertical");
 }
 else {
 HbStyle::setItemName(mScrollBar, "scrollbar-horizontal");
 }
 mScrollBar->setZValue(q->zValue() + 1);
 QObject::connect(mScrollBar, SIGNAL(valueChanged(qreal, Qt::Orientation)),
 q, SLOT(_q_thumbPositionChanged(qreal, Qt::Orientation)));
 return mContainer->getVisibleItemIndices();
 }
 void HgWidgetPrivate::setIndexFeedbackPolicy( HgWidget::IndexFeedbackPolicy policy)
 {
+Q_UNUSED(policy)
 //    mIndexFeedback->setIndexFeedbackPolicy(policy);
 }
 HgWidget::IndexFeedbackPolicy HgWidgetPrivate::indexFeedbackPolicy() const
 {
 item->updateItemData();
 }
 }
 }
 mContainer->itemDataChanged(topLeft, bottomRight);
+if (mContainer->selectionModel()) {
+QModelIndex currentIndex = mContainer->selectionModel()->currentIndex();
+if (currentIndex.isValid() &&
+currentIndex.row() >= topLeft.row() &&
+currentIndex.row() <= bottomRight.row()) {
+updateCurrentItem(currentIndex);
+}
+}
 }
 void HgWidgetPrivate::setItemSizePolicy(HgWidget::ItemSizePolicy policy)
 {
 mContainer->setItemSizePolicy(policy);

branch	GCC_SURGE
changeset 10	c348b9772569
parent 9	dde80bf4a8c7
child 7	5ebec3429918
child 13	8bf920201dea