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

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 #include <hbabstractitemcontainer_p.h>
 #include <hbwidgetfeedback.h>
 #include <hbinstance.h>
 #include <hbscrollbar.h>
 #include <hbmodeliterator.h>
+#include <hbdataform.h>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsScene>
 #include <QDebug>
 */
 void HbAbstractItemView::reset()
 {
 Q_D(HbAbstractItemView);
+d->stopAnimating();
 d->mModelIterator->setRootIndex(QPersistentModelIndex());
 d->resetContainer();
 setCurrentIndex(QModelIndex(), QItemSelectionModel::NoUpdate);
 }
 Q_D(HbAbstractItemView);
 bool result = HbScrollArea::event(e);
 // The two above statements have to be executed before these
-if (e->type() == HbEvent::ChildFocusIn) {
+if (e->type() == QEvent::LayoutRequest) {
-HbAbstractViewItem *item = 0;
-QList<HbAbstractViewItem *> items = d->mContainer->items();
-for (QGraphicsItem *currentItem = scene()->focusItem(); currentItem != 0; currentItem = currentItem->parentItem()) {
-item = d->viewItem(currentItem);
-if (item) {
-if (items.indexOf(item) == -1) {
-item = 0;
-} else {
-break;
-}
-}
-}
-if (item && item->modelIndex() != d->mCurrentIndex) {
-setCurrentIndex(item->modelIndex());
-}
-result = true;
-} else if (e->type() == QEvent::LayoutRequest) {
 d->mContainer->resizeContainer();
 if (d->mPostponedScrollIndex.isValid()) {
 d->scrollTo(d->mPostponedScrollIndex, d->mPostponedScrollHint);
 }
 result = true;
 current is the changed or current index and previous in the old current index.
 current index may not be selected.
 */
 void HbAbstractItemView::currentIndexChanged(const QModelIndex &current, const QModelIndex &previous)
 {
-Q_D(HbAbstractItemView);
+Q_UNUSED(previous);
+Q_D(HbAbstractItemView);
 if (current != d->mCurrentIndex) {
 d->mCurrentIndex = current;
-if (previous.isValid()) {
-d->mContainer->setItemTransientStateValue(previous, "focused", false);
-}
-if (d->mCurrentIndex.isValid()) {
-d->mContainer->setItemTransientStateValue(d->mCurrentIndex, "focused", true);
-}
 }
 }
 /*!
 This slot is called when selection of items has changed.
 mouseReleaseEvent.setPos(pos);
 d->mSelectionModel->select(index, selectionCommand(item, &mouseReleaseEvent));
 }
 emitActivated(index);
+setCurrentIndex(index);
 }
 /*!
 This slot is called when view item is long pressed and long press is enabled in itemview.
 Default implementation calls longPressed().
 QModelIndex index = item->modelIndex();
 d->mSelectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
 emit longPressed(item, item->mapToScene(pos));
+setCurrentIndex(index);
 }
 /*!
 This slot is called when concrete view item has been created. Default implementation connects
 touch event related signals of HbAbstractViewItem to respective slots in this class.
 Q_D(const HbAbstractItemView);
 return d->mLongPressEnabled;
 }
 /*!
+Enables item's pixmap cache if \a enable is true, or disables item's pixmap cache if \a enable is false.
+Enabling item's pixmap cache will significantly improve the item view scrolling speed. That is why in
+most of the cases the pixmap cache should be enabled. It should only be disabled if there is a real need to
+do it like; a custom view item prototype used that cannot update the pixmap properly or an effect is applied
+to view item's child item.
+\note Item pixmap cache is not supported by HbDataForm.
+By default, the item's pixmap cache is disabled.
+\sa HbAbstractItemView::itemPixmapCacheEnabled(), HbAbstractViewItem::updatePixmapCache()
+*/
+void HbAbstractItemView::setItemPixmapCacheEnabled(bool enabled)
+{
+Q_D(HbAbstractItemView);
+if (qgraphicsitem_cast<HbDataForm*>(this) == 0) {
+d->mItemPixmapCacheEnabled = enabled;
+}
+}
+/*!
+Returns true if item's pixmap cache is enabled; otherwise returns false.
+\sa HbAbstractItemView::setItemPixmapCacheEnabled()
+*/
+bool HbAbstractItemView::itemPixmapCacheEnabled() const
+{
+Q_D(const HbAbstractItemView);
+return d->mItemPixmapCacheEnabled;
+}
+/*!
 Slot handles QAbstractItemModel::layoutChanged() signal.
 Default implementation sets first model item visible as first view item.
 */
 void HbAbstractItemView::modelLayoutChanged()
 {

changeset 21	4633027730f5
parent 6	c3690ec91ef8
child 23	e6ad4ef83b23