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

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include "hbtreemodeliterator_p.h"
 #include <QItemSelection>
 #include <QGraphicsSceneMouseEvent>
+// for QMAP_INT__ITEM_STATE_DEPRECATED's sake
+#include <hbabstractviewitem.h>
 /*!
 @alpha
 @hbwidgets
 \class HbTreeView
 \brief HbTreeView represents a hierarchical list
 }
 }
 }
 if ( itemRecycling()) {
-bool itemBuffered = d->mContainer->itemByIndex(newIndex);
+if (    !d->mContainer->itemByIndex(newIndex)
-if (! (     itemBuffered
+||  hint != EnsureVisible) {
-&&  hint == PositionAtTop)) {
 if ( hint != PositionAtTop ) {
 // Following two variable applies only for hint EnsureVisible.
 // It is position relative to the view
 bool belowBottom = false;
 bool aboveTop = false;
 return;
 }
 if (d->isParentValid(parent)) {
 if (isExpanded(parent) || parent == d->mModelIterator->rootIndex()) {
-HbAbstractItemView::rowsInserted(parent, start, end);
+int lastStartPoint = 0;
+for (int i = start; i <= end; ++i) {
+QModelIndex newParent = d->treeModelIterator()->index(i, parent);
+int childCount = d->treeModelIterator()->childCount(newParent);
+if (childCount > 0 && isExpanded(newParent)) {
+HbAbstractItemView::rowsInserted(parent, lastStartPoint, i);
+lastStartPoint = i;
+rowsInserted(newParent, 0, childCount - 1);
+}
+}
+HbAbstractItemView::rowsInserted(parent, lastStartPoint, end);
+if (d->animationEnabled(true)) {
+if (d->mInSetExpanded) {
+d->startAppearEffect("treeviewitem", "expand", parent, start, end);
+} else {
+d->startAppearEffect("viewitem", "appear", parent, start, end);
+}
+}
 }
 HbAbstractViewItem *parentItem = d->mContainer->itemByIndex(parent);
 if (parentItem) {
 parentItem->updateChildItems();
 }
 }
 }
 /*!
 \reimp
 if (d->mSelectionModel) {
 d->mSelectionModel->setCurrentIndex(newCurrentIndex, QItemSelectionModel::NoUpdate);
 }
 }
-if (isExpanded(parent) || parent == d->mModelIterator->rootIndex()) {
+if (isExpanded(parent) || parent == d->mModelIterator->rootIndex() || d->mInSetExpanded) {
+bool animate = d->animationEnabled(false);
+QList<HbAbstractViewItem *> items = d->mContainer->items();
 for (int i = d->mItemsToBeDeleted.count() - 1; i >= 0; --i) {
 int pos = d->mItemsToBeDeleted.at(i);
-d->mContainer->removeItem(pos);
+HbAbstractViewItem *item = items.at(pos);
+if (item) {
+if (animate) {
+HbEffect::cancel(item, "appear");
+HbEffect::cancel(item, "expand");
+QString effectType;
+QString itemType;
+if (d->mInSetExpanded) {
+effectType = "collapse";
+itemType = "treeviewitem";
+} else {
+effectType = "disappear";
+itemType = "viewitem";
+}
+item->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+HbEffect::start(item,
+itemType,
+effectType,
+d->mContainer,
+"animationFinished");
+if (HbEffect::effectRunning(item, effectType)) {
+d->mContainer->removeItem(pos, animate);
+}
+} else {
+d->mContainer->removeItem(pos, animate);
+}
+}
 }
 }
 HbAbstractViewItem *parentItem = d->mContainer->itemByIndex(parent);
 if (parentItem) {
 parentItem->updateChildItems();
 }
 }
-d->mItemsToBeDeleted.clear();
 }
 /*!
 \reimp
 */
 void HbTreeView::rowsAboutToBeRemoved(const QModelIndex &index, int start, int end)
 {
 Q_D(HbTreeView);
-d->mItemsToBeDeleted.clear();
+if (d->isParentValid(index)) {
+d->mItemsToBeDeleted.clear();
 QList <HbAbstractViewItem *> items = d->mContainer->items();
 int itemCount = items.count();
 // Add the view items given as parameters and all their child items to a list for deletion.
 for (int i = start; i <= end; ++i) {
 QModelIndex parent = model()->index(i, 0, index);
 for (int j = 0; j < itemCount; ++j) {
 QModelIndex itemIndex = items.at(j)->modelIndex();
 if (itemIndex == parent || d->isChild(itemIndex, parent)) {
 d->mItemsToBeDeleted.append(j);
+}
 }
 }
 }
 }
 // Initially node1 is selected, then leaf1 is selected.
 // Node2 may have been set Unchecked into map before node1.
 // When node1 will be handled, node2 is unchecked in the map but not yet in the view item
 childCheckState = parentItems.value(childIndex);
 } else {
-QVariant value = d->mContainer->itemState(childIndex).value(HbTreeViewItem::CheckStateKey);
+QVariant value = d->mContainer->itemTransientState(childIndex).value("checkState");
 if (value.isValid()) {
 childCheckState = (Qt::CheckState)value.toInt();
 }
 }
 if (childCheckState != Qt::Unchecked) {
 HbAbstractViewItem *item = d->mContainer->itemByIndex(iterator.key());
 if (item) {
 item->setCheckState(iterator.value());
 }
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
 d->mContainer->setItemStateValue(iterator.key(), HbAbstractViewItem::CheckStateKey, iterator.value());
+#endif
+d->mContainer->setItemTransientStateValue(iterator.key(), "checkState", iterator.value());
 iterator++;
 }
 d->mSelectionStarted = false;
 }
 void HbTreeView::setExpanded(const QModelIndex &index, bool expanded)
 {
 Q_D(HbTreeView);
 if (isExpanded(index) != expanded) {
-d->treeModelIterator()->itemStateChanged(index, HbTreeViewItem::ExpansionKey);
+d->mInSetExpanded = true;
-HbTreeItemContainer *container = qobject_cast<HbTreeItemContainer *>(d->mContainer);
+d->treeModelIterator()->itemExpansionChanged(index);
-container->setExpanded(index, expanded);
+#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
+d->mContainer->setItemStateValue(index, HbTreeViewItem::ExpansionKey, expanded);
+#endif
+d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
+int childCount = d->treeModelIterator()->childCount(index) - 1;
+if (expanded) {
+rowsAboutToBeInserted(index, 0, childCount);
+rowsInserted(index, 0, childCount);
+} else {
+rowsAboutToBeRemoved(index, 0, childCount);
+rowsRemoved(index, 0, childCount);
+}
+HbTreeViewItem *item = qobject_cast<HbTreeViewItem *>(itemByIndex(index));
+if (item) {
+item->setExpanded(expanded);
+}
+d->mInSetExpanded = false;
 }
 }
 /*!
 Returns true if the model item \a index is expanded; otherwise returns false.
 */
 bool HbTreeView::isExpanded(const QModelIndex &index) const
 {
 Q_D(const HbTreeView);
-HbTreeItemContainer *container = qobject_cast<HbTreeItemContainer *>(d->mContainer);
+QVariant flags = d->mContainer->itemTransientState(index).value("expanded");
-return container->isExpanded(index);
+if (flags.isValid() && flags.toBool() == true) {
+return true;
+} else {
+return false;
+}
 }
 /*!
 Overrides default indentation of tree view items defined in style sheet.
 Items, which are not immediate children of root item are indented by
 indentation * level pixels.
 HbAbstractItemView::setRootIndex(index);
 setExpanded(index, true);
 }
 /*!
-This function handles expanding and collapsing parent items in tree view.
-Parent item expands and collapses, when pressed down is released
-exluding following use cases:
-\li HbTreeViewItem::selectionAreaContains() has returned true for pressed down
-\li view is panned or scrolled
-\sa HbTreeViewItem::selectionAreaContains()
-*/
-void HbTreeView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-Q_D(HbTreeView);
-HbTreeViewItem* hitItem = qobject_cast<HbTreeViewItem*>(d->itemAt(event->scenePos()));
-// check whether expansion collapsion can be done
-if (    d->mHitItem
-&&  d->mHitItem == hitItem
-&&  hitItem->primitive(HbStyle::P_TreeViewItem_expandicon)
-&&  hitItem->flags().testFlag(QGraphicsItem::ItemIsFocusable)
-&&  !d->mWasScrolling
-&&  (   d->mSelectionMode == SingleSelection
-|| !d->mSelectionSettings.testFlag(HbAbstractItemViewPrivate::Selection))) {
-Hb::InteractionModifiers modifiers = 0;
-if (hitItem->isExpanded()) {
-d->mInstantClickedModifiers |= Hb::ModifierExpandedItem;
-} else {
-d->mInstantClickedModifiers |= Hb::ModifierCollapsedItem;
-}
-hitItem->setExpanded(!hitItem->isExpanded());
-}
-HbAbstractItemView::mouseReleaseEvent(event);
-}
-/*!
 \reimp
 Tree view has its internal selection model. Implementation of this virtual function is needed
 to take it into use with new model..
 */
 void HbTreeView::setModel(QAbstractItemModel *model, HbAbstractViewItem *prototype)

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9