X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/225fd7073e1f8fc35405ad998dd9f382f61b5b4b..d80e9db9fb801bb5230c5b80190e5630bd738823:/src/kitemviews/kitemlistview.cpp diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index b89f4d0f5..387c37aea 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -23,7 +23,8 @@ #include "kitemlistview.h" #include "kitemlistcontroller.h" -#include "kitemlistgroupheader.h" +#include "kitemlistheader_p.h" +#include "kitemlistrubberband_p.h" #include "kitemlistselectionmanager.h" #include "kitemlistsizehintresolver_p.h" #include "kitemlistviewlayouter_p.h" @@ -32,13 +33,26 @@ #include +#include #include +#include #include #include +#include #include +namespace { + // Time in ms until reaching the autoscroll margin triggers + // an initial autoscrolling + const int InitialAutoScrollDelay = 700; + + // Delay in ms for triggering the next autoscroll + const int RepeatingAutoScrollDelay = 1000 / 60; +} + KItemListView::KItemListView(QGraphicsWidget* parent) : QGraphicsWidget(parent), + m_enabledSelectionToggles(false), m_grouped(false), m_activeTransactions(0), m_itemSize(), @@ -46,6 +60,7 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_model(0), m_visibleRoles(), m_visibleRolesSizes(), + m_stretchedVisibleRolesSizes(), m_widgetCreator(0), m_groupHeaderCreator(0), m_styleOption(), @@ -55,8 +70,17 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_layouter(0), m_animation(0), m_layoutTimer(0), - m_oldOffset(0), - m_oldMaximumOffset(0) + m_oldScrollOffset(0), + m_oldMaximumScrollOffset(0), + m_oldItemOffset(0), + m_oldMaximumItemOffset(0), + m_skipAutoScrollForRubberBand(false), + m_rubberBand(0), + m_mousePos(), + m_autoScrollIncrement(0), + m_autoScrollTimer(0), + m_header(0), + m_useHeaderWidths(false) { setAcceptHoverEvents(true); @@ -73,6 +97,9 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_layoutTimer->setInterval(300); m_layoutTimer->setSingleShot(true); connect(m_layoutTimer, SIGNAL(timeout()), this, SLOT(slotLayoutTimerFinished())); + + m_rubberBand = new KItemListRubberBand(this); + connect(m_rubberBand, SIGNAL(activationChanged(bool)), this, SLOT(slotRubberBandActivationChanged(bool))); } KItemListView::~KItemListView() @@ -91,8 +118,19 @@ void KItemListView::setScrollOrientation(Qt::Orientation orientation) m_layouter->setScrollOrientation(orientation); m_animation->setScrollOrientation(orientation); m_sizeHintResolver->clearCache(); - updateLayout(); + + if (m_grouped) { + QMutableHashIterator it (m_visibleGroups); + while (it.hasNext()) { + it.next(); + it.value()->setScrollOrientation(orientation); + } + } + + doLayout(Animation); + onScrollOrientationChanged(orientation, previousOrientation); + emit scrollOrientationChanged(orientation, previousOrientation); } Qt::Orientation KItemListView::scrollOrientation() const @@ -109,16 +147,14 @@ void KItemListView::setItemSize(const QSizeF& itemSize) m_itemSize = itemSize; - if (!markVisibleRolesSizesAsDirty()) { - if (itemSize.width() < previousSize.width() || itemSize.height() < previousSize.height()) { - prepareLayoutForIncreasedItemCount(itemSize, ItemSize); - } else { - m_layouter->setItemSize(itemSize); - } + if (itemSize.isEmpty()) { + updateVisibleRolesSizes(); + } else { + m_layouter->setItemSize(itemSize); } m_sizeHintResolver->clearCache(); - updateLayout(); + doLayout(Animation); onItemSizeChanged(itemSize, previousSize); } @@ -127,39 +163,67 @@ QSizeF KItemListView::itemSize() const return m_itemSize; } -void KItemListView::setOffset(qreal offset) +void KItemListView::setScrollOffset(qreal offset) { if (offset < 0) { offset = 0; } - const qreal previousOffset = m_layouter->offset(); + const qreal previousOffset = m_layouter->scrollOffset(); if (offset == previousOffset) { return; } - m_layouter->setOffset(offset); - m_animation->setOffset(offset); - if (!m_layoutTimer->isActive()) { - doLayout(NoAnimation, 0, 0); - update(); + m_layouter->setScrollOffset(offset); + m_animation->setScrollOffset(offset); + + // Don't check whether the m_layoutTimer is active: Changing the + // scroll offset must always trigger a synchronous layout, otherwise + // the smooth-scrolling might get jerky. + doLayout(NoAnimation); + onScrollOffsetChanged(offset, previousOffset); +} + +qreal KItemListView::scrollOffset() const +{ + return m_layouter->scrollOffset(); +} + +qreal KItemListView::maximumScrollOffset() const +{ + return m_layouter->maximumScrollOffset(); +} + +void KItemListView::setItemOffset(qreal offset) +{ + if (m_layouter->itemOffset() == offset) { + return; } - onOffsetChanged(offset, previousOffset); + + m_layouter->setItemOffset(offset); + if (m_header) { + m_header->setPos(-offset, 0); + } + + // Don't check whether the m_layoutTimer is active: Changing the + // item offset must always trigger a synchronous layout, otherwise + // the smooth-scrolling might get jerky. + doLayout(NoAnimation); } -qreal KItemListView::offset() const +qreal KItemListView::itemOffset() const { - return m_layouter->offset(); + return m_layouter->itemOffset(); } -qreal KItemListView::maximumOffset() const +qreal KItemListView::maximumItemOffset() const { - return m_layouter->maximumOffset(); + return m_layouter->maximumItemOffset(); } -void KItemListView::setVisibleRoles(const QHash& roles) +void KItemListView::setVisibleRoles(const QList& roles) { - const QHash previousRoles = m_visibleRoles; + const QList previousRoles = m_visibleRoles; m_visibleRoles = roles; QHashIterator it(m_visibleItems); @@ -167,22 +231,66 @@ void KItemListView::setVisibleRoles(const QHash& roles) it.next(); KItemListWidget* widget = it.value(); widget->setVisibleRoles(roles); - widget->setVisibleRolesSizes(m_visibleRolesSizes); + widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes); } m_sizeHintResolver->clearCache(); m_layouter->markAsDirty(); - onVisibleRolesChanged(roles, previousRoles); - markVisibleRolesSizesAsDirty(); - updateLayout(); + if (m_header) { + m_header->setVisibleRoles(roles); + m_header->setVisibleRolesWidths(headerRolesWidths()); + m_useHeaderWidths = false; + } + + updateVisibleRolesSizes(); + doLayout(Animation); + + onVisibleRolesChanged(roles, previousRoles); } -QHash KItemListView::visibleRoles() const +QList KItemListView::visibleRoles() const { return m_visibleRoles; } +void KItemListView::setAutoScroll(bool enabled) +{ + if (enabled && !m_autoScrollTimer) { + m_autoScrollTimer = new QTimer(this); + m_autoScrollTimer->setSingleShot(false); + connect(m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(triggerAutoScrolling())); + m_autoScrollTimer->start(InitialAutoScrollDelay); + } else if (!enabled && m_autoScrollTimer) { + delete m_autoScrollTimer; + m_autoScrollTimer = 0; + } + +} + +bool KItemListView::autoScroll() const +{ + return m_autoScrollTimer != 0; +} + +void KItemListView::setEnabledSelectionToggles(bool enabled) +{ + if (m_enabledSelectionToggles != enabled) { + m_enabledSelectionToggles = enabled; + + QHashIterator it(m_visibleItems); + while (it.hasNext()) { + it.next(); + it.value()->setEnabledSelectionToggle(enabled); + } + } +} + +bool KItemListView::enabledSelectionToggles() const +{ + return m_enabledSelectionToggles; +} + KItemListController* KItemListView::controller() const { return m_controller; @@ -225,7 +333,7 @@ void KItemListView::setStyleOption(const KItemListStyleOption& option) } m_sizeHintResolver->clearCache(); - updateLayout(); + doLayout(Animation); onStyleOptionChanged(option, previousOption); } @@ -237,29 +345,59 @@ const KItemListStyleOption& KItemListView::styleOption() const void KItemListView::setGeometry(const QRectF& rect) { QGraphicsWidget::setGeometry(rect); + if (!m_model) { return; } + const QSizeF newSize = rect.size(); if (m_itemSize.isEmpty()) { - m_layouter->setItemSize(QSizeF()); - } - - if (m_model->count() > 0) { - prepareLayoutForIncreasedItemCount(rect.size(), LayouterSize); + // The item size is dynamic: + // Changing the geometry does not require to do an expensive + // update of the visible-roles sizes, only the stretched sizes + // need to be adjusted to the new size. + updateStretchedVisibleRolesSizes(); + + if (m_useHeaderWidths) { + QSizeF dynamicItemSize = m_layouter->itemSize(); + + if (m_itemSize.width() < 0) { + const qreal requiredWidth = visibleRolesSizesWidthSum(); + if (newSize.width() > requiredWidth) { + dynamicItemSize.setWidth(newSize.width()); + } + const qreal headerWidth = qMax(newSize.width(), requiredWidth); + m_header->resize(headerWidth, m_header->size().height()); + } + + if (m_itemSize.height() < 0) { + const qreal requiredHeight = visibleRolesSizesHeightSum(); + if (newSize.height() > requiredHeight) { + dynamicItemSize.setHeight(newSize.height()); + } + // TODO: KItemListHeader is not prepared for vertical alignment + } + + m_layouter->setItemSize(dynamicItemSize); + } + + // Triggering a synchronous layout is fine from a performance point of view, + // as with dynamic item sizes no moving animation must be done. + m_layouter->setSize(newSize); + doLayout(Animation); } else { - m_layouter->setSize(rect.size()); + // The item size is not dynamic and most probably the geometry change results + // in animated position changes of the items. Trigger an asynchronous relayout + // with m_layoutTimer to prevent performance bottlenecks. + m_layouter->setSize(newSize); + if (!m_layoutTimer->isActive()) { + m_layoutTimer->start(); + } } - - m_layoutTimer->start(); } int KItemListView::itemAt(const QPointF& pos) const { - if (!m_model) { - return -1; - } - QHashIterator it(m_visibleItems); while (it.hasNext()) { it.next(); @@ -276,8 +414,18 @@ int KItemListView::itemAt(const QPointF& pos) const bool KItemListView::isAboveSelectionToggle(int index, const QPointF& pos) const { - Q_UNUSED(index); - Q_UNUSED(pos); + if (!m_enabledSelectionToggles) { + return false; + } + + const KItemListWidget* widget = m_visibleItems.value(index); + if (widget) { + const QRectF selectionToggleRect = widget->selectionToggleRect(); + if (!selectionToggleRect.isEmpty()) { + const QPointF mappedPos = widget->mapFromItem(this, pos); + return selectionToggleRect.contains(mappedPos); + } + } return false; } @@ -310,11 +458,66 @@ QSizeF KItemListView::itemSizeHint(int index) const return itemSize(); } -QHash KItemListView::visibleRoleSizes() const +QHash KItemListView::visibleRolesSizes(const KItemRangeList& itemRanges) const { + Q_UNUSED(itemRanges); return QHash(); } +bool KItemListView::supportsItemExpanding() const +{ + return false; +} + +QRectF KItemListView::itemRect(int index) const +{ + return m_layouter->itemRect(index); +} + +QRectF KItemListView::itemContextRect(int index) const +{ + QRectF contextRect; + + const KItemListWidget* widget = m_visibleItems.value(index); + if (widget) { + contextRect = widget->iconRect() | widget->textRect(); + contextRect.translate(itemRect(index).topLeft()); + } + + return contextRect; +} + +void KItemListView::scrollToItem(int index) +{ + QRectF viewGeometry = geometry(); + if (m_header) { + const qreal headerHeight = m_header->size().height(); + viewGeometry.adjust(0, headerHeight, 0, 0); + } + const QRectF currentRect = itemRect(index); + + if (!viewGeometry.contains(currentRect)) { + qreal newOffset = scrollOffset(); + if (scrollOrientation() == Qt::Vertical) { + if (currentRect.top() < viewGeometry.top()) { + newOffset += currentRect.top() - viewGeometry.top(); + } else if (currentRect.bottom() > viewGeometry.bottom()) { + newOffset += currentRect.bottom() - viewGeometry.bottom(); + } + } else { + if (currentRect.left() < viewGeometry.left()) { + newOffset += currentRect.left() - viewGeometry.left(); + } else if (currentRect.right() > viewGeometry.right()) { + newOffset += currentRect.right() - viewGeometry.right(); + } + } + + if (newOffset != scrollOffset()) { + emit scrollTo(newOffset); + } + } +} + void KItemListView::beginTransaction() { ++m_activeTransactions; @@ -333,7 +536,7 @@ void KItemListView::endTransaction() if (m_activeTransactions == 0) { onTransactionEnd(); - updateLayout(); + doLayout(Animation); } } @@ -342,11 +545,82 @@ bool KItemListView::isTransactionActive() const return m_activeTransactions > 0; } + +void KItemListView::setHeaderShown(bool show) +{ + + if (show && !m_header) { + m_header = new KItemListHeader(this); + m_header->setPos(0, 0); + m_header->setModel(m_model); + m_header->setVisibleRoles(m_visibleRoles); + m_header->setVisibleRolesWidths(headerRolesWidths()); + m_header->setZValue(1); + + connect(m_header, SIGNAL(visibleRoleWidthChanged(QByteArray,qreal,qreal)), + this, SLOT(slotVisibleRoleWidthChanged(QByteArray,qreal,qreal))); + connect(m_header, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), + this, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder))); + connect(m_header, SIGNAL(sortRoleChanged(QByteArray,QByteArray)), + this, SIGNAL(sortRoleChanged(QByteArray,QByteArray))); + + m_useHeaderWidths = false; + + m_layouter->setHeaderHeight(m_header->size().height()); + } else if (!show && m_header) { + delete m_header; + m_header = 0; + m_useHeaderWidths = false; + m_layouter->setHeaderHeight(0); + } +} + +bool KItemListView::isHeaderShown() const +{ + return m_header != 0; +} + +QPixmap KItemListView::createDragPixmap(const QSet& indexes) const +{ + Q_UNUSED(indexes); + return QPixmap(); +} + +void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) +{ + QGraphicsWidget::paint(painter, option, widget); + + if (m_rubberBand->isActive()) { + QRectF rubberBandRect = QRectF(m_rubberBand->startPosition(), + m_rubberBand->endPosition()).normalized(); + + const QPointF topLeft = rubberBandRect.topLeft(); + if (scrollOrientation() == Qt::Vertical) { + rubberBandRect.moveTo(topLeft.x(), topLeft.y() - scrollOffset()); + } else { + rubberBandRect.moveTo(topLeft.x() - scrollOffset(), topLeft.y()); + } + + QStyleOptionRubberBand opt; + opt.initFrom(widget); + opt.shape = QRubberBand::Rectangle; + opt.opaque = false; + opt.rect = rubberBandRect.toRect(); + style()->drawControl(QStyle::CE_RubberBand, &opt, painter); + } +} + void KItemListView::initializeItemListWidget(KItemListWidget* item) { Q_UNUSED(item); } +bool KItemListView::itemSizeHintUpdateRequired(const QSet& changedRoles) const +{ + Q_UNUSED(changedRoles); + return true; +} + void KItemListView::onControllerChanged(KItemListController* current, KItemListController* previous) { Q_UNUSED(current); @@ -371,13 +645,13 @@ void KItemListView::onItemSizeChanged(const QSizeF& current, const QSizeF& previ Q_UNUSED(previous); } -void KItemListView::onOffsetChanged(qreal current, qreal previous) +void KItemListView::onScrollOffsetChanged(qreal current, qreal previous) { Q_UNUSED(current); Q_UNUSED(previous); } -void KItemListView::onVisibleRolesChanged(const QHash& current, const QHash& previous) +void KItemListView::onVisibleRolesChanged(const QList& current, const QList& previous) { Q_UNUSED(current); Q_UNUSED(previous); @@ -409,57 +683,46 @@ bool KItemListView::event(QEvent* event) void KItemListView::mousePressEvent(QGraphicsSceneMouseEvent* event) { + m_mousePos = transform().map(event->pos()); event->accept(); } -void KItemListView::hoverMoveEvent(QGraphicsSceneHoverEvent* event) +void KItemListView::mouseMoveEvent(QGraphicsSceneMouseEvent* event) { - if (!m_model) { - return; - } - - QHashIterator it(m_visibleItems); - while (it.hasNext()) { - it.next(); + QGraphicsWidget::mouseMoveEvent(event); - KItemListWidget* widget = it.value(); - KItemListStyleOption styleOption = widget->styleOption(); - const QPointF mappedPos = widget->mapFromItem(this, event->pos()); - - const bool hovered = widget->contains(mappedPos) && - !widget->expansionToggleRect().contains(mappedPos) && - !widget->selectionToggleRect().contains(mappedPos); - if (hovered) { - if (!(styleOption.state & QStyle::State_MouseOver)) { - styleOption.state |= QStyle::State_MouseOver; - widget->setStyleOption(styleOption); - } - } else if (styleOption.state & QStyle::State_MouseOver) { - styleOption.state &= ~QStyle::State_MouseOver; - widget->setStyleOption(styleOption); - } + m_mousePos = transform().map(event->pos()); + if (m_autoScrollTimer && !m_autoScrollTimer->isActive()) { + m_autoScrollTimer->start(InitialAutoScrollDelay); } } -void KItemListView::hoverLeaveEvent(QGraphicsSceneHoverEvent* event) +void KItemListView::dragEnterEvent(QGraphicsSceneDragDropEvent* event) +{ + event->setAccepted(true); + setAutoScroll(true); +} + +void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent *event) { - Q_UNUSED(event); + QGraphicsWidget::dragMoveEvent(event); - if (!m_model) { - return; + m_mousePos = transform().map(event->pos()); + if (m_autoScrollTimer && !m_autoScrollTimer->isActive()) { + m_autoScrollTimer->start(InitialAutoScrollDelay); } +} - QHashIterator it(m_visibleItems); - while (it.hasNext()) { - it.next(); +void KItemListView::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) +{ + QGraphicsWidget::dragLeaveEvent(event); + setAutoScroll(false); +} - KItemListWidget* widget = it.value(); - KItemListStyleOption styleOption = widget->styleOption(); - if (styleOption.state & QStyle::State_MouseOver) { - styleOption.state &= ~QStyle::State_MouseOver; - widget->setStyleOption(styleOption); - } - } +void KItemListView::dropEvent(QGraphicsSceneDragDropEvent* event) +{ + QGraphicsWidget::dropEvent(event); + setAutoScroll(false); } QList KItemListView::visibleItemListWidgets() const @@ -469,20 +732,25 @@ QList KItemListView::visibleItemListWidgets() const void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges) { - markVisibleRolesSizesAsDirty(); + updateVisibleRolesSizes(itemRanges); const bool hasMultipleRanges = (itemRanges.count() > 1); if (hasMultipleRanges) { beginTransaction(); } + int previouslyInsertedCount = 0; foreach (const KItemRange& range, itemRanges) { - const int index = range.index; + // range.index is related to the model before anything has been inserted. + // As in each loop the current item-range gets inserted the index must + // be increased by the already previously inserted items. + const int index = range.index + previouslyInsertedCount; const int count = range.count; if (index < 0 || count <= 0) { kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")"; continue; } + previouslyInsertedCount += count; m_sizeHintResolver->itemsInserted(index, count); @@ -508,32 +776,32 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges) } m_layouter->markAsDirty(); - if (m_model->count() == count && maximumOffset() > size().height()) { - kDebug() << "Scrollbar required, skipping layout"; - const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); - QSizeF layouterSize = m_layouter->size(); - if (scrollOrientation() == Qt::Vertical) { - layouterSize.rwidth() -= scrollBarExtent; - } else { - layouterSize.rheight() -= scrollBarExtent; + if (m_model->count() == count && m_activeTransactions == 0) { + // Check whether a scrollbar is required to show the inserted items. In this case + // the size of the layouter will be decreased before calling doLayout(): This prevents + // an unnecessary temporary animation due to the geometry change of the inserted scrollbar. + const bool verticalScrollOrientation = (scrollOrientation() == Qt::Vertical); + const bool decreaseLayouterSize = ( verticalScrollOrientation && maximumScrollOffset() > size().height()) || + (!verticalScrollOrientation && maximumScrollOffset() > size().width()); + if (decreaseLayouterSize) { + const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); + QSizeF layouterSize = m_layouter->size(); + if (verticalScrollOrientation) { + layouterSize.rwidth() -= scrollBarExtent; + } else { + layouterSize.rheight() -= scrollBarExtent; + } + m_layouter->setSize(layouterSize); } - m_layouter->setSize(layouterSize); } if (!hasMultipleRanges) { doLayout(Animation, index, count); - update(); } + } - if (m_controller) { - KItemListSelectionManager* selectionManager = m_controller->selectionManager(); - const int current = selectionManager->currentItem(); - if (current < 0) { - selectionManager->setCurrentItem(0); - } else if (current >= index) { - selectionManager->setCurrentItem(current + count); - } - } + if (m_controller) { + m_controller->selectionManager()->itemsInserted(itemRanges); } if (hasMultipleRanges) { @@ -543,7 +811,7 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges) void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) { - markVisibleRolesSizesAsDirty(); + updateVisibleRolesSizes(); const bool hasMultipleRanges = (itemRanges.count() > 1); if (hasMultipleRanges) { @@ -608,17 +876,19 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) m_layouter->markAsDirty(); if (!hasMultipleRanges) { + // The decrease-layout-size optimization in KItemListView::slotItemsInserted() + // assumes an updated geometry. If items are removed during an active transaction, + // the transaction will be temporary deactivated so that doLayout() triggers a + // geometry update if necessary. + const int activeTransactions = m_activeTransactions; + m_activeTransactions = 0; doLayout(Animation, index, -count); - update(); + m_activeTransactions = activeTransactions; } + } - /*KItemListSelectionManager* selectionManager = m_controller->selectionManager(); - const int current = selectionManager->currentItem(); - if (count() <= 0) { - selectionManager->setCurrentItem(-1); - } else if (current >= index) { - selectionManager->setCurrentItem(current + count); - }*/ + if (m_controller) { + m_controller->selectionManager()->itemsRemoved(itemRanges); } if (hasMultipleRanges) { @@ -626,15 +896,54 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) } } +void KItemListView::slotItemsMoved(const KItemRange& itemRange, const QList& movedToIndexes) +{ + m_sizeHintResolver->itemsMoved(itemRange.index, itemRange.count); + m_layouter->markAsDirty(); + + if (m_controller) { + m_controller->selectionManager()->itemsMoved(itemRange, movedToIndexes); + } + + const int firstVisibleMovedIndex = qMax(firstVisibleIndex(), itemRange.index); + const int lastVisibleMovedIndex = qMin(lastVisibleIndex(), itemRange.index + itemRange.count - 1); + + for (int index = firstVisibleMovedIndex; index <= lastVisibleMovedIndex; ++index) { + KItemListWidget* widget = m_visibleItems.value(index); + if (widget) { + updateWidgetProperties(widget, index); + if (m_grouped) { + updateGroupHeaderForWidget(widget); + } + initializeItemListWidget(widget); + } + } + + doLayout(NoAnimation); +} + void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges, const QSet& roles) { + const bool updateSizeHints = itemSizeHintUpdateRequired(roles); + if (updateSizeHints) { + updateVisibleRolesSizes(itemRanges); + } + foreach (const KItemRange& itemRange, itemRanges) { const int index = itemRange.index; const int count = itemRange.count; - m_sizeHintResolver->itemsChanged(index, count, roles); + if (updateSizeHints) { + m_sizeHintResolver->itemsChanged(index, count, roles); + m_layouter->markAsDirty(); + if (!m_layoutTimer->isActive()) { + m_layoutTimer->start(); + } + } + + // Apply the changed roles to the visible item-widgets const int lastIndex = index + count - 1; for (int i = index; i <= lastIndex; ++i) { KItemListWidget* widget = m_visibleItems.value(i); @@ -642,27 +951,88 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges, widget->setData(m_model->data(i), roles); } } + + if (m_grouped && roles.contains(m_model->sortRole())) { + // The sort-role has been changed which might result + // in modified group headers + updateVisibleGroupHeaders(); + doLayout(NoAnimation); + } } } -void KItemListView::currentChanged(int current, int previous) +void KItemListView::slotGroupedSortingChanged(bool current) +{ + m_grouped = current; + m_layouter->markAsDirty(); + + if (m_grouped) { + // Apply the height of the header to the layouter + const qreal groupHeaderHeight = m_styleOption.fontMetrics.height() + + m_styleOption.margin * 2; + m_layouter->setGroupHeaderHeight(groupHeaderHeight); + + updateVisibleGroupHeaders(); + } else { + // Clear all visible headers + QMutableHashIterator it (m_visibleGroups); + while (it.hasNext()) { + it.next(); + recycleGroupHeaderForWidget(it.key()); + } + Q_ASSERT(m_visibleGroups.isEmpty()); + } + + doLayout(Animation); +} + +void KItemListView::slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) +{ + Q_UNUSED(current); + Q_UNUSED(previous); + if (m_grouped) { + updateVisibleGroupHeaders(); + doLayout(Animation); + } +} + +void KItemListView::slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) +{ + Q_UNUSED(current); + Q_UNUSED(previous); + if (m_grouped) { + updateVisibleGroupHeaders(); + doLayout(Animation); + } +} + +void KItemListView::slotCurrentChanged(int current, int previous) +{ + Q_UNUSED(previous); + + KItemListWidget* previousWidget = m_visibleItems.value(previous, 0); + if (previousWidget) { + Q_ASSERT(previousWidget->isCurrent()); + previousWidget->setCurrent(false); + } + + KItemListWidget* currentWidget = m_visibleItems.value(current, 0); + if (currentWidget) { + Q_ASSERT(!currentWidget->isCurrent()); + currentWidget->setCurrent(true); + } +} + +void KItemListView::slotSelectionChanged(const QSet& current, const QSet& previous) { Q_UNUSED(previous); QHashIterator it(m_visibleItems); while (it.hasNext()) { it.next(); - + const int index = it.key(); KItemListWidget* widget = it.value(); - KItemListStyleOption styleOption = widget->styleOption(); - if (it.key() == current) { - styleOption.state |= QStyle::State_HasFocus; - widget->setStyleOption(styleOption); - } - else if (styleOption.state & QStyle::State_HasFocus) { - styleOption.state &= ~QStyle::State_HasFocus; - widget->setStyleOption(styleOption); - } + widget->setSelected(current.contains(index)); } } @@ -682,11 +1052,7 @@ void KItemListView::slotAnimationFinished(QGraphicsWidget* widget, // All KItemListWidgets that are animated by the DeleteAnimation are not maintained // by m_visibleWidgets and must be deleted manually after the animation has // been finished. - KItemListGroupHeader* header = m_visibleGroups.value(itemListWidget); - if (header) { - m_groupHeaderCreator->recycle(header); - m_visibleGroups.remove(itemListWidget); - } + recycleGroupHeaderForWidget(itemListWidget); m_widgetCreator->recycle(itemListWidget); break; } @@ -710,14 +1076,142 @@ void KItemListView::slotAnimationFinished(QGraphicsWidget* widget, void KItemListView::slotLayoutTimerFinished() { m_layouter->setSize(geometry().size()); - doLayout(Animation, 0, 0); + doLayout(Animation); +} + +void KItemListView::slotRubberBandPosChanged() +{ + update(); +} + +void KItemListView::slotRubberBandActivationChanged(bool active) +{ + if (active) { + connect(m_rubberBand, SIGNAL(startPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged())); + connect(m_rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged())); + m_skipAutoScrollForRubberBand = true; + } else { + disconnect(m_rubberBand, SIGNAL(startPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged())); + disconnect(m_rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandPosChanged())); + m_skipAutoScrollForRubberBand = false; + } + + update(); +} + +void KItemListView::slotVisibleRoleWidthChanged(const QByteArray& role, + qreal currentWidth, + qreal previousWidth) +{ + Q_UNUSED(previousWidth); + + m_useHeaderWidths = true; + + if (m_visibleRolesSizes.contains(role)) { + QSizeF roleSize = m_visibleRolesSizes.value(role); + roleSize.setWidth(currentWidth); + m_visibleRolesSizes.insert(role, roleSize); + m_stretchedVisibleRolesSizes.insert(role, roleSize); + + // Apply the new size to the layouter + QSizeF dynamicItemSize = m_itemSize; + if (dynamicItemSize.width() < 0) { + const qreal requiredWidth = visibleRolesSizesWidthSum(); + dynamicItemSize.setWidth(qMax(size().width(), requiredWidth)); + } + if (dynamicItemSize.height() < 0) { + const qreal requiredHeight = visibleRolesSizesHeightSum(); + dynamicItemSize.setHeight(qMax(size().height(), requiredHeight)); + } + + m_layouter->setItemSize(dynamicItemSize); + + // Update the role sizes for all visible widgets + foreach (KItemListWidget* widget, visibleItemListWidgets()) { + widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes); + } + + doLayout(Animation); + } +} + +void KItemListView::triggerAutoScrolling() +{ + if (!m_autoScrollTimer) { + return; + } + + int pos = 0; + int visibleSize = 0; + if (scrollOrientation() == Qt::Vertical) { + pos = m_mousePos.y(); + visibleSize = size().height(); + } else { + pos = m_mousePos.x(); + visibleSize = size().width(); + } + + if (m_autoScrollTimer->interval() == InitialAutoScrollDelay) { + m_autoScrollIncrement = 0; + } + + m_autoScrollIncrement = calculateAutoScrollingIncrement(pos, visibleSize, m_autoScrollIncrement); + if (m_autoScrollIncrement == 0) { + // The mouse position is not above an autoscroll margin (the autoscroll timer + // will be restarted in mouseMoveEvent()) + m_autoScrollTimer->stop(); + return; + } + + if (m_rubberBand->isActive() && m_skipAutoScrollForRubberBand) { + // If a rubberband selection is ongoing the autoscrolling may only get triggered + // if the direction of the rubberband is similar to the autoscroll direction. This + // prevents that starting to create a rubberband within the autoscroll margins starts + // an autoscrolling. + + const qreal minDiff = 4; // Ignore any autoscrolling if the rubberband is very small + const qreal diff = (scrollOrientation() == Qt::Vertical) + ? m_rubberBand->endPosition().y() - m_rubberBand->startPosition().y() + : m_rubberBand->endPosition().x() - m_rubberBand->startPosition().x(); + if (qAbs(diff) < minDiff || (m_autoScrollIncrement < 0 && diff > 0) || (m_autoScrollIncrement > 0 && diff < 0)) { + // The rubberband direction is different from the scroll direction (e.g. the rubberband has + // been moved up although the autoscroll direction might be down) + m_autoScrollTimer->stop(); + return; + } + } + + // As soon as the autoscrolling has been triggered at least once despite having an active rubberband, + // the autoscrolling may not get skipped anymore until a new rubberband is created + m_skipAutoScrollForRubberBand = false; + + const qreal maxVisibleOffset = qMax(qreal(0), maximumScrollOffset() - visibleSize); + const qreal newScrollOffset = qMin(scrollOffset() + m_autoScrollIncrement, maxVisibleOffset); + setScrollOffset(newScrollOffset); + + // Trigger the autoscroll timer which will periodically call + // triggerAutoScrolling() + m_autoScrollTimer->start(RepeatingAutoScrollDelay); } void KItemListView::setController(KItemListController* controller) { if (m_controller != controller) { KItemListController* previous = m_controller; + if (previous) { + KItemListSelectionManager* selectionManager = previous->selectionManager(); + disconnect(selectionManager, SIGNAL(currentChanged(int,int)), this, SLOT(slotCurrentChanged(int,int))); + disconnect(selectionManager, SIGNAL(selectionChanged(QSet,QSet)), this, SLOT(slotSelectionChanged(QSet,QSet))); + } + m_controller = controller; + + if (controller) { + KItemListSelectionManager* selectionManager = controller->selectionManager(); + connect(selectionManager, SIGNAL(currentChanged(int,int)), this, SLOT(slotCurrentChanged(int,int))); + connect(selectionManager, SIGNAL(selectionChanged(QSet,QSet)), this, SLOT(slotSelectionChanged(QSet,QSet))); + } + onControllerChanged(controller, previous); } } @@ -737,11 +1231,19 @@ void KItemListView::setModel(KItemModelBase* model) this, SLOT(slotItemsInserted(KItemRangeList))); disconnect(m_model, SIGNAL(itemsRemoved(KItemRangeList)), this, SLOT(slotItemsRemoved(KItemRangeList))); + disconnect(m_model, SIGNAL(itemsMoved(KItemRange,QList)), + this, SLOT(slotItemsMoved(KItemRange,QList))); + disconnect(m_model, SIGNAL(groupedSortingChanged(bool)), + this, SLOT(slotGroupedSortingChanged(bool))); + disconnect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), + this, SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder))); + disconnect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)), + this, SLOT(slotSortRoleChanged(QByteArray,QByteArray))); } m_model = model; - m_layouter->setModel(model); - m_grouped = !model->groupRole().isEmpty(); + m_layouter->setModel(model); + m_grouped = model->groupedSorting(); if (m_model) { connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet)), @@ -750,63 +1252,53 @@ void KItemListView::setModel(KItemModelBase* model) this, SLOT(slotItemsInserted(KItemRangeList))); connect(m_model, SIGNAL(itemsRemoved(KItemRangeList)), this, SLOT(slotItemsRemoved(KItemRangeList))); + connect(m_model, SIGNAL(itemsMoved(KItemRange,QList)), + this, SLOT(slotItemsMoved(KItemRange,QList))); + connect(m_model, SIGNAL(groupedSortingChanged(bool)), + this, SLOT(slotGroupedSortingChanged(bool))); + connect(m_model, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), + this, SLOT(slotSortOrderChanged(Qt::SortOrder,Qt::SortOrder))); + connect(m_model, SIGNAL(sortRoleChanged(QByteArray,QByteArray)), + this, SLOT(slotSortRoleChanged(QByteArray,QByteArray))); } onModelChanged(model, previous); } -void KItemListView::updateLayout() +KItemListRubberBand* KItemListView::rubberBand() const { - doLayout(Animation, 0, 0); - update(); + return m_rubberBand; } void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount) { if (m_layoutTimer->isActive()) { - kDebug() << "Stopping layout timer, synchronous layout requested"; m_layoutTimer->stop(); } - if (m_model->count() < 0 || m_activeTransactions > 0) { + if (!m_model || m_model->count() < 0 || m_activeTransactions > 0) { return; } - applyDynamicItemSize(); - - const int firstVisibleIndex = m_layouter->firstVisibleIndex(); - const int lastVisibleIndex = m_layouter->lastVisibleIndex(); + int firstVisibleIndex = m_layouter->firstVisibleIndex(); if (firstVisibleIndex < 0) { emitOffsetChanges(); return; } - // Do a sanity check of the offset-property: When properties of the itemlist-view have been changed + // Do a sanity check of the scroll-offset property: When properties of the itemlist-view have been changed // it might be possible that the maximum offset got changed too. Assure that the full visible range // is still shown if the maximum offset got decreased. const qreal visibleOffsetRange = (scrollOrientation() == Qt::Horizontal) ? size().width() : size().height(); - const qreal maxOffsetToShowFullRange = maximumOffset() - visibleOffsetRange; - if (offset() > maxOffsetToShowFullRange) { - m_layouter->setOffset(qMax(qreal(0), maxOffsetToShowFullRange)); + const qreal maxOffsetToShowFullRange = maximumScrollOffset() - visibleOffsetRange; + if (scrollOffset() > maxOffsetToShowFullRange) { + m_layouter->setScrollOffset(qMax(qreal(0), maxOffsetToShowFullRange)); + firstVisibleIndex = m_layouter->firstVisibleIndex(); } - // Determine all items that are completely invisible and might be - // reused for items that just got (at least partly) visible. - // Items that do e.g. an animated moving of their position are not - // marked as invisible: This assures that a scrolling inside the view - // can be done without breaking an animation. - QList reusableItems; - QHashIterator it(m_visibleItems); - while (it.hasNext()) { - it.next(); - KItemListWidget* widget = it.value(); - const int index = widget->index(); - const bool invisible = (index < firstVisibleIndex) || (index > lastVisibleIndex); - if (invisible && !m_animation->isStarted(widget)) { - widget->setVisible(false); - reusableItems.append(index); - } - } + const int lastVisibleIndex = m_layouter->lastVisibleIndex(); + + QList reusableItems = recycleInvisibleItems(firstVisibleIndex, lastVisibleIndex); // Assure that for each visible item a KItemListWidget is available. KItemListWidget // instances from invisible items are reused. If no reusable items are @@ -816,7 +1308,7 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha bool applyNewPos = true; bool wasHidden = false; - const QRectF itemBounds = m_layouter->itemBoundingRect(i); + const QRectF itemBounds = m_layouter->itemRect(i); const QPointF newPos = itemBounds.topLeft(); KItemListWidget* widget = m_visibleItems.value(i); if (!widget) { @@ -826,6 +1318,10 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha const int oldIndex = reusableItems.takeLast(); widget = m_visibleItems.value(oldIndex); setWidgetIndex(widget, i); + + if (m_grouped) { + updateGroupHeaderForWidget(widget); + } } else { // No reusable KItemListWidget instance is available, create a new one widget = createWidget(i); @@ -834,14 +1330,15 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha if (animate && changedCount < 0) { // Items have been deleted, move the created item to the - // imaginary old position. - const QRectF itemBoundingRect = m_layouter->itemBoundingRect(i - changedCount); - if (itemBoundingRect.isEmpty()) { + // imaginary old position. They will get animated to the new position + // later. + const QRectF itemRect = m_layouter->itemRect(i - changedCount); + if (itemRect.isEmpty()) { const QPointF invisibleOldPos = (scrollOrientation() == Qt::Vertical) ? QPointF(0, size().height()) : QPointF(size().width(), 0); widget->setPos(invisibleOldPos); } else { - widget->setPos(itemBoundingRect.topLeft()); + widget->setPos(itemRect.topLeft()); } applyNewPos = false; } @@ -852,11 +1349,9 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha if (animate) { const bool itemsRemoved = (changedCount < 0); const bool itemsInserted = (changedCount > 0); - if (itemsRemoved && (i >= changedIndex + changedCount + 1)) { // The item is located after the removed items. Animate the moving of the position. - m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos); - applyNewPos = false; + applyNewPos = !moveWidget(widget, itemBounds); } else if (itemsInserted && i >= changedIndex) { // The item is located after the first inserted item if (i <= changedIndex + changedCount - 1) { @@ -870,13 +1365,11 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha // The item was already there before, so animate the moving of the position. // No moving animation is done if the item is animated by a create animation: This // prevents a "move animation mess" when inserting several ranges in parallel. - m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos); - applyNewPos = false; + applyNewPos = !moveWidget(widget, itemBounds); } } else if (!itemsRemoved && !itemsInserted && !wasHidden) { // The size of the view might have been changed. Animate the moving of the position. - m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos); - applyNewPos = false; + applyNewPos = !moveWidget(widget, itemBounds); } } @@ -888,7 +1381,21 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha widget->setVisible(true); if (widget->size() != itemBounds.size()) { - m_animation->start(widget, KItemListViewAnimation::ResizeAnimation, itemBounds.size()); + // Resize the widget for the item to the changed size. + if (animate) { + // If a dynamic item size is used then no animation is done in the direction + // of the dynamic size. + if (m_itemSize.width() <= 0) { + // The width is dynamic, apply the new width without animation. + widget->resize(itemBounds.width(), widget->size().height()); + } else if (m_itemSize.height() <= 0) { + // The height is dynamic, apply the new height without animation. + widget->resize(widget->size().width(), itemBounds.height()); + } + m_animation->start(widget, KItemListViewAnimation::ResizeAnimation, itemBounds.size()); + } else { + widget->resize(itemBounds.size()); + } } } @@ -897,47 +1404,144 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha recycleWidget(m_visibleItems.value(index)); } + if (m_grouped) { + // Update the layout of all visible group headers + QHashIterator it(m_visibleGroups); + while (it.hasNext()) { + it.next(); + updateGroupHeaderLayout(it.key()); + } + } + emitOffsetChanges(); } +QList KItemListView::recycleInvisibleItems(int firstVisibleIndex, int lastVisibleIndex) +{ + // Determine all items that are completely invisible and might be + // reused for items that just got (at least partly) visible. + // Items that do e.g. an animated moving of their position are not + // marked as invisible: This assures that a scrolling inside the view + // can be done without breaking an animation. + + QList items; + + QHashIterator it(m_visibleItems); + while (it.hasNext()) { + it.next(); + KItemListWidget* widget = it.value(); + const int index = widget->index(); + const bool invisible = (index < firstVisibleIndex) || (index > lastVisibleIndex); + if (invisible && !m_animation->isStarted(widget)) { + widget->setVisible(false); + items.append(index); + + if (m_grouped) { + recycleGroupHeaderForWidget(widget); + } + } + } + + return items; +} + +bool KItemListView::moveWidget(KItemListWidget* widget,const QRectF& itemBounds) +{ + const QPointF oldPos = widget->pos(); + const QPointF newPos = itemBounds.topLeft(); + if (oldPos == newPos) { + return false; + } + + bool startMovingAnim = m_itemSize.isEmpty(); + if (!startMovingAnim) { + // When having a grid the moving-animation should only be started, if it is done within + // one row in the vertical scroll-orientation or one column in the horizontal scroll-orientation. + // Otherwise instead of a moving-animation a create-animation on the new position will be used + // instead. This is done to prevent overlapping (and confusing) moving-animations. + + int zoomDiff = 0; + if (widget->size() != itemBounds.size()) { + // The item-size has been increased or decreased + const bool zoomOut = (widget->size().width() >= itemBounds.size().width()) && + (widget->size().height() >= itemBounds.size().height()); + zoomDiff = zoomOut ? -1 : +1; + } + + const qreal xMax = m_itemSize.width(); + const qreal yMax = m_itemSize.height(); + qreal xDiff = oldPos.x() - newPos.x(); + qreal yDiff = oldPos.y() - newPos.y(); + if (scrollOrientation() == Qt::Vertical) { + if (zoomDiff != 0) { + // Skip moving animations that changed the row + startMovingAnim = (zoomDiff > 0 && xDiff < xMax) || + (zoomDiff < 0 && -xDiff < xMax); + } else { + xDiff = qAbs(xDiff); + yDiff = qAbs(yDiff); + startMovingAnim = (xDiff > yDiff && yDiff < yMax); + } + } else { + if (zoomDiff != 0) { + // Skip moving animations that changed the column + startMovingAnim = (zoomDiff > 0 && yDiff < yMax) || + (zoomDiff < 0 && -yDiff < yMax); + } else { + xDiff = qAbs(xDiff); + yDiff = qAbs(yDiff); + startMovingAnim = (yDiff > xDiff && xDiff < xMax); + } + } + } + + if (startMovingAnim) { + m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos); + return true; + } + + m_animation->stop(widget); + m_animation->start(widget, KItemListViewAnimation::CreateAnimation); + return false; +} + void KItemListView::emitOffsetChanges() { - const int newOffset = m_layouter->offset(); - if (m_oldOffset != newOffset) { - emit offsetChanged(newOffset, m_oldOffset); - m_oldOffset = newOffset; + const qreal newScrollOffset = m_layouter->scrollOffset(); + if (m_oldScrollOffset != newScrollOffset) { + emit scrollOffsetChanged(newScrollOffset, m_oldScrollOffset); + m_oldScrollOffset = newScrollOffset; + } + + const qreal newMaximumScrollOffset = m_layouter->maximumScrollOffset(); + if (m_oldMaximumScrollOffset != newMaximumScrollOffset) { + emit maximumScrollOffsetChanged(newMaximumScrollOffset, m_oldMaximumScrollOffset); + m_oldMaximumScrollOffset = newMaximumScrollOffset; + } + + const qreal newItemOffset = m_layouter->itemOffset(); + if (m_oldItemOffset != newItemOffset) { + emit itemOffsetChanged(newItemOffset, m_oldItemOffset); + m_oldItemOffset = newItemOffset; } - const int newMaximumOffset = m_layouter->maximumOffset(); - if (m_oldMaximumOffset != newMaximumOffset) { - emit maximumOffsetChanged(newMaximumOffset, m_oldMaximumOffset); - m_oldMaximumOffset = newMaximumOffset; + const qreal newMaximumItemOffset = m_layouter->maximumItemOffset(); + if (m_oldMaximumItemOffset != newMaximumItemOffset) { + emit maximumItemOffsetChanged(newMaximumItemOffset, m_oldMaximumItemOffset); + m_oldMaximumItemOffset = newMaximumItemOffset; } } KItemListWidget* KItemListView::createWidget(int index) { KItemListWidget* widget = m_widgetCreator->create(this); - widget->setVisibleRoles(m_visibleRoles); - widget->setVisibleRolesSizes(m_visibleRolesSizes); - - KItemListStyleOption option = m_styleOption; - if (index == m_controller->selectionManager()->currentItem()) { - option.state |= QStyle::State_HasFocus; - } - widget->setStyleOption(option); + widget->setFlag(QGraphicsItem::ItemStacksBehindParent); - widget->setIndex(index); - widget->setData(m_model->data(index)); + updateWidgetProperties(widget, index); m_visibleItems.insert(index, widget); if (m_grouped) { - if (m_layouter->isFirstGroupItem(index)) { - KItemListGroupHeader* header = m_groupHeaderCreator->create(widget); - header->setPos(0, -50); - header->resize(50, 50); - m_visibleGroups.insert(widget, header); - } + updateGroupHeaderForWidget(widget); } initializeItemListWidget(widget); @@ -947,11 +1551,7 @@ KItemListWidget* KItemListView::createWidget(int index) void KItemListView::recycleWidget(KItemListWidget* widget) { if (m_grouped) { - KItemListGroupHeader* header = m_visibleGroups.value(widget); - if (header) { - m_groupHeaderCreator->recycle(header); - m_visibleGroups.remove(widget); - } + recycleGroupHeaderForWidget(widget); } m_visibleItems.remove(widget->index()); @@ -960,145 +1560,314 @@ void KItemListView::recycleWidget(KItemListWidget* widget) void KItemListView::setWidgetIndex(KItemListWidget* widget, int index) { - if (m_grouped) { - bool createHeader = m_layouter->isFirstGroupItem(index); - KItemListGroupHeader* header = m_visibleGroups.value(widget); - if (header) { - if (createHeader) { - createHeader = false; - } else { - m_groupHeaderCreator->recycle(header); - m_visibleGroups.remove(widget); - } - } - - if (createHeader) { - KItemListGroupHeader* header = m_groupHeaderCreator->create(widget); - header->setPos(0, -50); - header->resize(50, 50); - m_visibleGroups.insert(widget, header); - } - } - const int oldIndex = widget->index(); m_visibleItems.remove(oldIndex); - widget->setVisibleRoles(m_visibleRoles); - widget->setVisibleRolesSizes(m_visibleRolesSizes); + updateWidgetProperties(widget, index); + m_visibleItems.insert(index, widget); - KItemListStyleOption option = m_styleOption; - if (index == m_controller->selectionManager()->currentItem()) { - option.state |= QStyle::State_HasFocus; + initializeItemListWidget(widget); +} + +void KItemListView::setLayouterSize(const QSizeF& size, SizeType sizeType) +{ + switch (sizeType) { + case LayouterSize: m_layouter->setSize(size); break; + case ItemSize: m_layouter->setItemSize(size); break; + default: break; } - widget->setStyleOption(option); +} +void KItemListView::updateWidgetProperties(KItemListWidget* widget, int index) +{ + widget->setVisibleRoles(m_visibleRoles); + widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes); + widget->setStyleOption(m_styleOption); + + const KItemListSelectionManager* selectionManager = m_controller->selectionManager(); + widget->setCurrent(index == selectionManager->currentItem()); + widget->setSelected(selectionManager->isSelected(index)); + widget->setHovered(false); + widget->setAlternatingBackgroundColors(false); + widget->setEnabledSelectionToggle(enabledSelectionToggles()); widget->setIndex(index); widget->setData(m_model->data(index)); - m_visibleItems.insert(index, widget); - - initializeItemListWidget(widget); } -void KItemListView::prepareLayoutForIncreasedItemCount(const QSizeF& size, SizeType sizeType) +void KItemListView::updateGroupHeaderForWidget(KItemListWidget* widget) { - // Calculate the first visible index and last visible index for the current size - const int currentFirst = m_layouter->firstVisibleIndex(); - const int currentLast = m_layouter->lastVisibleIndex(); + Q_ASSERT(m_grouped); - const QSizeF currentSize = (sizeType == LayouterSize) ? m_layouter->size() : m_layouter->itemSize(); - - // Calculate the first visible index and last visible index for the new size - setLayouterSize(size, sizeType); - const int newFirst = m_layouter->firstVisibleIndex(); - const int newLast = m_layouter->lastVisibleIndex(); + const int index = widget->index(); + if (!m_layouter->isFirstGroupItem(index)) { + // The widget does not represent the first item of a group + // and hence requires no header + recycleGroupHeaderForWidget(widget); + return; + } - if ((currentFirst != newFirst) || (currentLast != newLast)) { - // At least one index has been changed. Assure that widgets for all possible - // visible items get created so that a move-animation can be started later. - const int maxVisibleItems = m_layouter->maximumVisibleItems(); - int minFirst = qMin(newFirst, currentFirst); - const int maxLast = qMax(newLast, currentLast); + const QList > groups = model()->groups(); + if (groups.isEmpty()) { + return; + } - if (maxLast - minFirst + 1 < maxVisibleItems) { - // Increasing the size might result in a smaller KItemListView::offset(). - // Decrease the first visible index in a way that at least the maximum - // visible items are shown. - minFirst = qMax(0, maxLast - maxVisibleItems + 1); + KItemListGroupHeader* header = m_visibleGroups.value(widget); + if (!header) { + header = m_groupHeaderCreator->create(this); + header->setParentItem(widget); + m_visibleGroups.insert(widget, header); + } + Q_ASSERT(header->parentItem() == widget); + + // Determine the shown data for the header by doing a binary + // search in the groups-list + int min = 0; + int max = groups.count() - 1; + int mid = 0; + do { + mid = (min + max) / 2; + if (index > groups.at(mid).first) { + min = mid + 1; + } else { + max = mid - 1; } + } while (groups.at(mid).first != index && min <= max); - if (maxLast - minFirst > maxVisibleItems + maxVisibleItems / 2) { - // The creating of widgets is quite expensive. Assure that never more - // than 50 % of the maximum visible items get created for the animations. - return; - } + header->setData(groups.at(mid).second); + header->setRole(model()->sortRole()); + header->setStyleOption(m_styleOption); + header->setScrollOrientation(scrollOrientation()); - setLayouterSize(currentSize, sizeType); - for (int i = minFirst; i <= maxLast; ++i) { - if (!m_visibleItems.contains(i)) { - KItemListWidget* widget = createWidget(i); - const QPointF pos = m_layouter->itemBoundingRect(i).topLeft(); - widget->setPos(pos); - } - } - setLayouterSize(size, sizeType); + header->show(); +} + +void KItemListView::updateGroupHeaderLayout(KItemListWidget* widget) +{ + KItemListGroupHeader* header = m_visibleGroups.value(widget); + Q_ASSERT(header); + + const int index = widget->index(); + const QRectF groupHeaderRect = m_layouter->groupHeaderRect(index); + const QRectF itemRect = m_layouter->itemRect(index); + + // The group-header is a child of the itemlist widget. Translate the + // group header position to the relative position. + const QPointF groupHeaderPos(groupHeaderRect.x() - itemRect.x(), + - groupHeaderRect.height()); + header->setPos(groupHeaderPos); + header->resize(groupHeaderRect.size()); +} + +void KItemListView::recycleGroupHeaderForWidget(KItemListWidget* widget) +{ + KItemListGroupHeader* header = m_visibleGroups.value(widget); + if (header) { + header->setParentItem(0); + m_groupHeaderCreator->recycle(header); + m_visibleGroups.remove(widget); } } -void KItemListView::setLayouterSize(const QSizeF& size, SizeType sizeType) +void KItemListView::updateVisibleGroupHeaders() { - switch (sizeType) { - case LayouterSize: m_layouter->setSize(size); break; - case ItemSize: m_layouter->setItemSize(size); break; - default: break; + Q_ASSERT(m_grouped); + m_layouter->markAsDirty(); + + QHashIterator it(m_visibleItems); + while (it.hasNext()) { + it.next(); + updateGroupHeaderForWidget(it.value()); } } -bool KItemListView::markVisibleRolesSizesAsDirty() +QHash KItemListView::headerRolesWidths() const { - const bool dirty = m_itemSize.isEmpty(); - if (dirty) { - m_visibleRolesSizes.clear(); - m_layouter->setItemSize(QSizeF()); + QHash rolesWidths; + + QHashIterator it(m_stretchedVisibleRolesSizes); + while (it.hasNext()) { + it.next(); + rolesWidths.insert(it.key(), it.value().width()); } - return dirty; + + return rolesWidths; } -void KItemListView::applyDynamicItemSize() +void KItemListView::updateVisibleRolesSizes(const KItemRangeList& itemRanges) { - if (!m_itemSize.isEmpty()) { + if (!m_itemSize.isEmpty() || m_useHeaderWidths) { return; } - if (m_visibleRolesSizes.isEmpty()) { - m_visibleRolesSizes = visibleRoleSizes(); - foreach (KItemListWidget* widget, visibleItemListWidgets()) { - widget->setVisibleRolesSizes(m_visibleRolesSizes); - } + const int itemCount = m_model->count(); + int rangesItemCount = 0; + foreach (const KItemRange& range, itemRanges) { + rangesItemCount += range.count; } - if (m_layouter->itemSize().isEmpty()) { - qreal requiredWidth = 0; - qreal requiredHeight = 0; - - QHashIterator it(m_visibleRolesSizes); + if (itemCount == rangesItemCount) { + m_visibleRolesSizes = visibleRolesSizes(itemRanges); + if (m_header) { + // Assure the the sizes are not smaller than the minimum defined by the header + // TODO: Currently only implemented for a top-aligned header + const qreal minHeaderRoleWidth = m_header->minimumRoleWidth(); + QMutableHashIterator it (m_visibleRolesSizes); + while (it.hasNext()) { + it.next(); + const QSizeF& size = it.value(); + if (size.width() < minHeaderRoleWidth) { + const QSizeF newSize(minHeaderRoleWidth, size.height()); + m_visibleRolesSizes.insert(it.key(), newSize); + } + } + } + } else { + // Only a sub range of the roles need to be determined. + // The chances are good that the sizes of the sub ranges + // already fit into the available sizes and hence no + // expensive update might be required. + bool updateRequired = false; + + const QHash updatedSizes = visibleRolesSizes(itemRanges); + QHashIterator it(updatedSizes); while (it.hasNext()) { it.next(); - const QSizeF& visibleRoleSize = it.value(); - requiredWidth += visibleRoleSize.width(); - requiredHeight += visibleRoleSize.height(); + const QByteArray& role = it.key(); + const QSizeF& updatedSize = it.value(); + const QSizeF currentSize = m_visibleRolesSizes.value(role); + if (updatedSize.width() > currentSize.width() || updatedSize.height() > currentSize.height()) { + m_visibleRolesSizes.insert(role, updatedSize); + updateRequired = true; + } } - QSizeF dynamicItemSize = m_itemSize; - if (dynamicItemSize.width() <= 0) { - dynamicItemSize.setWidth(qMax(requiredWidth, size().width())); + if (!updateRequired) { + // All the updated sizes are smaller than the current sizes and no change + // of the stretched roles-widths is required + return; } - if (dynamicItemSize.height() <= 0) { - dynamicItemSize.setHeight(qMax(requiredHeight, size().height())); + } + + updateStretchedVisibleRolesSizes(); +} + +void KItemListView::updateVisibleRolesSizes() +{ + if (!m_model) { + return; + } + + const int itemCount = m_model->count(); + if (itemCount > 0) { + updateVisibleRolesSizes(KItemRangeList() << KItemRange(0, itemCount)); + } +} + +void KItemListView::updateStretchedVisibleRolesSizes() +{ + if (!m_itemSize.isEmpty() || m_useHeaderWidths || m_visibleRoles.isEmpty()) { + return; + } + + // Calculate the maximum size of an item by considering the + // visible role sizes and apply them to the layouter. If the + // size does not use the available view-size it the size of the + // first role will get stretched. + m_stretchedVisibleRolesSizes = m_visibleRolesSizes; + const QByteArray role = m_visibleRoles.first(); + QSizeF firstRoleSize = m_stretchedVisibleRolesSizes.value(role); + + QSizeF dynamicItemSize = m_itemSize; + + if (dynamicItemSize.width() <= 0) { + const qreal requiredWidth = visibleRolesSizesWidthSum(); + const qreal availableWidth = size().width(); + if (requiredWidth < availableWidth) { + // Stretch the first role to use the whole width for the item + firstRoleSize.rwidth() += availableWidth - requiredWidth; + m_stretchedVisibleRolesSizes.insert(role, firstRoleSize); } + dynamicItemSize.setWidth(qMax(requiredWidth, availableWidth)); + } - m_layouter->setItemSize(dynamicItemSize); + if (dynamicItemSize.height() <= 0) { + const qreal requiredHeight = visibleRolesSizesHeightSum(); + const qreal availableHeight = size().height(); + if (requiredHeight < availableHeight) { + // Stretch the first role to use the whole height for the item + firstRoleSize.rheight() += availableHeight - requiredHeight; + m_stretchedVisibleRolesSizes.insert(role, firstRoleSize); + } + dynamicItemSize.setHeight(qMax(requiredHeight, availableHeight)); + } + + m_layouter->setItemSize(dynamicItemSize); + + if (m_header) { + m_header->setVisibleRolesWidths(headerRolesWidths()); + m_header->resize(dynamicItemSize.width(), m_header->size().height()); + } + + // Update the role sizes for all visible widgets + foreach (KItemListWidget* widget, visibleItemListWidgets()) { + widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes); } } +qreal KItemListView::visibleRolesSizesWidthSum() const +{ + qreal widthSum = 0; + QHashIterator it(m_visibleRolesSizes); + while (it.hasNext()) { + it.next(); + widthSum += it.value().width(); + } + return widthSum; +} + +qreal KItemListView::visibleRolesSizesHeightSum() const +{ + qreal heightSum = 0; + QHashIterator it(m_visibleRolesSizes); + while (it.hasNext()) { + it.next(); + heightSum += it.value().height(); + } + return heightSum; +} + +QRectF KItemListView::headerBoundaries() const +{ + return m_header ? m_header->geometry() : QRectF(); +} + +int KItemListView::calculateAutoScrollingIncrement(int pos, int range, int oldInc) +{ + int inc = 0; + + const int minSpeed = 4; + const int maxSpeed = 128; + const int speedLimiter = 96; + const int autoScrollBorder = 64; + + // Limit the increment that is allowed to be added in comparison to 'oldInc'. + // This assures that the autoscrolling speed grows gradually. + const int incLimiter = 1; + + if (pos < autoScrollBorder) { + inc = -minSpeed + qAbs(pos - autoScrollBorder) * (pos - autoScrollBorder) / speedLimiter; + inc = qMax(inc, -maxSpeed); + inc = qMax(inc, oldInc - incLimiter); + } else if (pos > range - autoScrollBorder) { + inc = minSpeed + qAbs(pos - range + autoScrollBorder) * (pos - range + autoScrollBorder) / speedLimiter; + inc = qMin(inc, maxSpeed); + inc = qMin(inc, oldInc + incLimiter); + } + + return inc; +} + + + KItemListCreatorBase::~KItemListCreatorBase() { qDeleteAll(m_recycleableWidgets); @@ -1140,6 +1909,7 @@ KItemListWidgetCreatorBase::~KItemListWidgetCreatorBase() void KItemListWidgetCreatorBase::recycle(KItemListWidget* widget) { + widget->setParentItem(0); widget->setOpacity(1.0); pushRecycleableWidget(widget); }