mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/master' into frameworks
This commit is contained in:
commit
c12dc996f5
|
@ -397,7 +397,41 @@ int KFileItemModel::index(const KUrl& url) const
|
||||||
index = m_items.value(urlToFind, -1);
|
index = m_items.value(urlToFind, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_ASSERT(index >= 0 || m_items.count() == m_itemData.count());
|
if (index < 0) {
|
||||||
|
// The item could not be found, even though all items from m_itemData
|
||||||
|
// should be in m_items now. We print some diagnostic information which
|
||||||
|
// might help to find the cause of the problem, but only once. This
|
||||||
|
// prevents that obtaining and printing the debugging information
|
||||||
|
// wastes CPU cycles and floods the shell or .xsession-errors.
|
||||||
|
static bool printDebugInfo = true;
|
||||||
|
|
||||||
|
if (m_items.count() != m_itemData.count() && printDebugInfo) {
|
||||||
|
printDebugInfo = false;
|
||||||
|
|
||||||
|
kWarning() << "The model is in an inconsistent state.";
|
||||||
|
kWarning() << "m_items.count() ==" << m_items.count();
|
||||||
|
kWarning() << "m_itemData.count() ==" << m_itemData.count();
|
||||||
|
|
||||||
|
// Check if there are multiple items with the same URL.
|
||||||
|
QMultiHash<KUrl, int> indexesForUrl;
|
||||||
|
for (int i = 0; i < m_itemData.count(); ++i) {
|
||||||
|
indexesForUrl.insert(m_itemData.at(i)->item.url(), i);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (const KUrl& url, indexesForUrl.uniqueKeys()) {
|
||||||
|
if (indexesForUrl.count(url) > 1) {
|
||||||
|
kWarning() << "Multiple items found with the URL" << url;
|
||||||
|
foreach (int index, indexesForUrl.values(url)) {
|
||||||
|
const ItemData* data = m_itemData.at(index);
|
||||||
|
kWarning() << "index" << index << ":" << data->item;
|
||||||
|
if (data->parent) {
|
||||||
|
kWarning() << "parent" << data->parent->item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
|
@ -464,9 +464,9 @@ int KItemListView::lastVisibleIndex() const
|
||||||
return m_layouter->lastVisibleIndex();
|
return m_layouter->lastVisibleIndex();
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListView::calculateItemSizeHints(QVector<QSizeF>& sizeHints) const
|
void KItemListView::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const
|
||||||
{
|
{
|
||||||
widgetCreator()->calculateItemSizeHints(sizeHints, this);
|
widgetCreator()->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListView::setSupportsItemExpanding(bool supportsExpanding)
|
void KItemListView::setSupportsItemExpanding(bool supportsExpanding)
|
||||||
|
|
|
@ -194,12 +194,14 @@ public:
|
||||||
int lastVisibleIndex() const;
|
int lastVisibleIndex() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Required size for all items in the model.
|
* @return Calculates the required size for all items in the model.
|
||||||
* The returned value might be larger than KItemListView::itemSize().
|
* It might be larger than KItemListView::itemSize().
|
||||||
* In this case the layout grid will be stretched to assure an
|
* In this case the layout grid will be stretched to assure an
|
||||||
* unclipped item.
|
* unclipped item.
|
||||||
|
* NOTE: the logical height (width) is actually the
|
||||||
|
* width (height) if the scroll orientation is Qt::Vertical!
|
||||||
*/
|
*/
|
||||||
void calculateItemSizeHints(QVector<QSizeF>& sizeHints) const;
|
void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If set to true, items having child-items can be expanded to show the child-items as
|
* If set to true, items having child-items can be expanded to show the child-items as
|
||||||
|
@ -805,7 +807,7 @@ public:
|
||||||
|
|
||||||
virtual void recycle(KItemListWidget* widget);
|
virtual void recycle(KItemListWidget* widget);
|
||||||
|
|
||||||
virtual void calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const = 0;
|
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const = 0;
|
||||||
|
|
||||||
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
||||||
int index,
|
int index,
|
||||||
|
@ -824,7 +826,7 @@ public:
|
||||||
|
|
||||||
virtual KItemListWidget* create(KItemListView* view);
|
virtual KItemListWidget* create(KItemListView* view);
|
||||||
|
|
||||||
virtual void calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const;
|
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
|
||||||
|
|
||||||
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
||||||
int index,
|
int index,
|
||||||
|
@ -857,9 +859,9 @@ KItemListWidget* KItemListWidgetCreator<T>::create(KItemListView* view)
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class T>
|
template<class T>
|
||||||
void KItemListWidgetCreator<T>::calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const
|
void KItemListWidgetCreator<T>::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
return m_informant->calculateItemSizeHints(sizeHints, view);
|
return m_informant->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, view);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class T>
|
template<class T>
|
||||||
|
|
|
@ -49,7 +49,7 @@ public:
|
||||||
KItemListWidgetInformant();
|
KItemListWidgetInformant();
|
||||||
virtual ~KItemListWidgetInformant();
|
virtual ~KItemListWidgetInformant();
|
||||||
|
|
||||||
virtual void calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const = 0;
|
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const = 0;
|
||||||
|
|
||||||
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
||||||
int index,
|
int index,
|
||||||
|
|
|
@ -78,7 +78,10 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
|
||||||
int index = *it;
|
int index = *it;
|
||||||
int count = 1;
|
int count = 1;
|
||||||
|
|
||||||
|
// Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
|
||||||
|
while (it != end && *it == index) {
|
||||||
++it;
|
++it;
|
||||||
|
}
|
||||||
|
|
||||||
while (it != end) {
|
while (it != end) {
|
||||||
if (*it == index + count) {
|
if (*it == index + count) {
|
||||||
|
@ -89,6 +92,11 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
|
||||||
count = 1;
|
count = 1;
|
||||||
}
|
}
|
||||||
++it;
|
++it;
|
||||||
|
|
||||||
|
// Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
|
||||||
|
while (it != end && *it == *(it - 1)) {
|
||||||
|
++it;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result << KItemRange(index, count);
|
result << KItemRange(index, count);
|
||||||
|
|
|
@ -55,19 +55,19 @@ KStandardItemListWidgetInformant::~KStandardItemListWidgetInformant()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const
|
void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
switch (static_cast<const KStandardItemListView*>(view)->itemLayout()) {
|
switch (static_cast<const KStandardItemListView*>(view)->itemLayout()) {
|
||||||
case KStandardItemListWidget::IconsLayout:
|
case KStandardItemListWidget::IconsLayout:
|
||||||
calculateIconsLayoutItemSizeHints(sizeHints, view);
|
calculateIconsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KStandardItemListWidget::CompactLayout:
|
case KStandardItemListWidget::CompactLayout:
|
||||||
calculateCompactLayoutItemSizeHints(sizeHints, view);
|
calculateCompactLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KStandardItemListWidget::DetailsLayout:
|
case KStandardItemListWidget::DetailsLayout:
|
||||||
calculateDetailsLayoutItemSizeHints(sizeHints, view);
|
calculateDetailsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -138,7 +138,7 @@ QFont KStandardItemListWidgetInformant::customizedFontForLinks(const QFont& base
|
||||||
return baseFont;
|
return baseFont;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const
|
void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
const KItemListStyleOption& option = view->styleOption();
|
const KItemListStyleOption& option = view->styleOption();
|
||||||
const QFont& normalFont = option.font;
|
const QFont& normalFont = option.font;
|
||||||
|
@ -154,8 +154,8 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
|
||||||
QTextOption textOption(Qt::AlignHCenter);
|
QTextOption textOption(Qt::AlignHCenter);
|
||||||
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
|
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
|
||||||
|
|
||||||
for (int index = 0; index < sizeHints.count(); ++index) {
|
for (int index = 0; index < logicalHeightHints.count(); ++index) {
|
||||||
if (!sizeHints.at(index).isEmpty()) {
|
if (logicalHeightHints.at(index) > 0.0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,11 +186,13 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
|
||||||
// Add one line for each additional information
|
// Add one line for each additional information
|
||||||
textHeight += additionalRolesSpacing;
|
textHeight += additionalRolesSpacing;
|
||||||
|
|
||||||
sizeHints[index] = QSizeF(itemWidth, textHeight + spacingAndIconHeight);
|
logicalHeightHints[index] = textHeight + spacingAndIconHeight;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const
|
logicalWidthHint = itemWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
const KItemListStyleOption& option = view->styleOption();
|
const KItemListStyleOption& option = view->styleOption();
|
||||||
const QFontMetrics& normalFontMetrics = option.fontMetrics;
|
const QFontMetrics& normalFontMetrics = option.fontMetrics;
|
||||||
|
@ -204,8 +206,8 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
|
||||||
|
|
||||||
const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
|
const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
|
||||||
|
|
||||||
for (int index = 0; index < sizeHints.count(); ++index) {
|
for (int index = 0; index < logicalHeightHints.count(); ++index) {
|
||||||
if (!sizeHints.at(index).isEmpty()) {
|
if (logicalHeightHints.at(index) > 0.0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -232,22 +234,18 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
|
||||||
width = maxWidth;
|
width = maxWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
sizeHints[index] = QSizeF(width, height);
|
logicalHeightHints[index] = width;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const
|
logicalWidthHint = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
|
||||||
{
|
{
|
||||||
const KItemListStyleOption& option = view->styleOption();
|
const KItemListStyleOption& option = view->styleOption();
|
||||||
const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
|
const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
|
||||||
|
logicalHeightHints.fill(height);
|
||||||
for (int index = 0; index < sizeHints.count(); ++index) {
|
logicalWidthHint = -1.0;
|
||||||
if (!sizeHints.at(index).isEmpty()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
sizeHints[index] = QSizeF(-1, height);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
|
KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
|
||||||
|
|
|
@ -38,7 +38,7 @@ public:
|
||||||
KStandardItemListWidgetInformant();
|
KStandardItemListWidgetInformant();
|
||||||
virtual ~KStandardItemListWidgetInformant();
|
virtual ~KStandardItemListWidgetInformant();
|
||||||
|
|
||||||
virtual void calculateItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const;
|
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
|
||||||
|
|
||||||
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
virtual qreal preferredRoleColumnWidth(const QByteArray& role,
|
||||||
int index,
|
int index,
|
||||||
|
@ -73,9 +73,9 @@ protected:
|
||||||
*/
|
*/
|
||||||
virtual QFont customizedFontForLinks(const QFont& baseFont) const;
|
virtual QFont customizedFontForLinks(const QFont& baseFont) const;
|
||||||
|
|
||||||
void calculateIconsLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const;
|
void calculateIconsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
|
||||||
void calculateCompactLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const;
|
void calculateCompactLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
|
||||||
void calculateDetailsLayoutItemSizeHints(QVector<QSizeF>& sizeHints, const KItemListView* view) const;
|
void calculateDetailsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
|
||||||
|
|
||||||
friend class KStandardItemListWidget; // Accesses roleText()
|
friend class KStandardItemListWidget; // Accesses roleText()
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
|
|
||||||
KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
|
KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
|
||||||
m_itemListView(itemListView),
|
m_itemListView(itemListView),
|
||||||
m_sizeHintCache(),
|
m_logicalHeightHintCache(),
|
||||||
|
m_logicalWidthHint(0.0),
|
||||||
m_needsResolving(false)
|
m_needsResolving(false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -35,7 +36,7 @@ KItemListSizeHintResolver::~KItemListSizeHintResolver()
|
||||||
QSizeF KItemListSizeHintResolver::sizeHint(int index)
|
QSizeF KItemListSizeHintResolver::sizeHint(int index)
|
||||||
{
|
{
|
||||||
updateCache();
|
updateCache();
|
||||||
return m_sizeHintCache.at(index);
|
return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index));
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
|
void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
|
||||||
|
@ -45,15 +46,15 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
|
||||||
insertedCount += range.count;
|
insertedCount += range.count;
|
||||||
}
|
}
|
||||||
|
|
||||||
const int currentCount = m_sizeHintCache.count();
|
const int currentCount = m_logicalHeightHintCache.count();
|
||||||
m_sizeHintCache.reserve(currentCount + insertedCount);
|
m_logicalHeightHintCache.reserve(currentCount + insertedCount);
|
||||||
|
|
||||||
// We build the new list from the end to the beginning to mimize the
|
// We build the new list from the end to the beginning to mimize the
|
||||||
// number of moves.
|
// number of moves.
|
||||||
m_sizeHintCache.insert(m_sizeHintCache.end(), insertedCount, QSizeF());
|
m_logicalHeightHintCache.insert(m_logicalHeightHintCache.end(), insertedCount, 0.0);
|
||||||
|
|
||||||
int sourceIndex = currentCount - 1;
|
int sourceIndex = currentCount - 1;
|
||||||
int targetIndex = m_sizeHintCache.count() - 1;
|
int targetIndex = m_logicalHeightHintCache.count() - 1;
|
||||||
int itemsToInsertBeforeCurrentRange = insertedCount;
|
int itemsToInsertBeforeCurrentRange = insertedCount;
|
||||||
|
|
||||||
for (int rangeIndex = itemRanges.count() - 1; rangeIndex >= 0; --rangeIndex) {
|
for (int rangeIndex = itemRanges.count() - 1; rangeIndex >= 0; --rangeIndex) {
|
||||||
|
@ -62,33 +63,33 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
|
||||||
|
|
||||||
// First: move all existing items that must be put behind 'range'.
|
// First: move all existing items that must be put behind 'range'.
|
||||||
while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index + range.count) {
|
while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index + range.count) {
|
||||||
m_sizeHintCache[targetIndex] = m_sizeHintCache[sourceIndex];
|
m_logicalHeightHintCache[targetIndex] = m_logicalHeightHintCache[sourceIndex];
|
||||||
--sourceIndex;
|
--sourceIndex;
|
||||||
--targetIndex;
|
--targetIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Then: insert QSizeF() for the items which are inserted into 'range'.
|
// Then: insert QSizeF() for the items which are inserted into 'range'.
|
||||||
while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index) {
|
while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index) {
|
||||||
m_sizeHintCache[targetIndex] = QSizeF();
|
m_logicalHeightHintCache[targetIndex] = 0.0;
|
||||||
--targetIndex;
|
--targetIndex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_needsResolving = true;
|
m_needsResolving = true;
|
||||||
|
|
||||||
Q_ASSERT(m_sizeHintCache.count() == m_itemListView->model()->count());
|
Q_ASSERT(m_logicalHeightHintCache.count() == m_itemListView->model()->count());
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
|
void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
|
||||||
{
|
{
|
||||||
const QVector<QSizeF>::iterator begin = m_sizeHintCache.begin();
|
const QVector<qreal>::iterator begin = m_logicalHeightHintCache.begin();
|
||||||
const QVector<QSizeF>::iterator end = m_sizeHintCache.end();
|
const QVector<qreal>::iterator end = m_logicalHeightHintCache.end();
|
||||||
|
|
||||||
KItemRangeList::const_iterator rangeIt = itemRanges.constBegin();
|
KItemRangeList::const_iterator rangeIt = itemRanges.constBegin();
|
||||||
const KItemRangeList::const_iterator rangeEnd = itemRanges.constEnd();
|
const KItemRangeList::const_iterator rangeEnd = itemRanges.constEnd();
|
||||||
|
|
||||||
QVector<QSizeF>::iterator destIt = begin + rangeIt->index;
|
QVector<qreal>::iterator destIt = begin + rangeIt->index;
|
||||||
QVector<QSizeF>::iterator srcIt = destIt + rangeIt->count;
|
QVector<qreal>::iterator srcIt = destIt + rangeIt->count;
|
||||||
|
|
||||||
++rangeIt;
|
++rangeIt;
|
||||||
|
|
||||||
|
@ -104,33 +105,33 @@ void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_sizeHintCache.erase(destIt, end);
|
m_logicalHeightHintCache.erase(destIt, end);
|
||||||
|
|
||||||
// Note that the cache size might temporarily not match the model size if
|
// Note that the cache size might temporarily not match the model size if
|
||||||
// this function is called from KItemListView::setModel() to empty the cache.
|
// this function is called from KItemListView::setModel() to empty the cache.
|
||||||
if (!m_sizeHintCache.isEmpty() && m_itemListView->model()) {
|
if (!m_logicalHeightHintCache.isEmpty() && m_itemListView->model()) {
|
||||||
Q_ASSERT(m_sizeHintCache.count() == m_itemListView->model()->count());
|
Q_ASSERT(m_logicalHeightHintCache.count() == m_itemListView->model()->count());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<int>& movedToIndexes)
|
void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<int>& movedToIndexes)
|
||||||
{
|
{
|
||||||
QVector<QSizeF> newSizeHintCache(m_sizeHintCache);
|
QVector<qreal> newLogicalHeightHintCache(m_logicalHeightHintCache);
|
||||||
|
|
||||||
const int movedRangeEnd = range.index + range.count;
|
const int movedRangeEnd = range.index + range.count;
|
||||||
for (int i = range.index; i < movedRangeEnd; ++i) {
|
for (int i = range.index; i < movedRangeEnd; ++i) {
|
||||||
const int newIndex = movedToIndexes.at(i - range.index);
|
const int newIndex = movedToIndexes.at(i - range.index);
|
||||||
newSizeHintCache[newIndex] = m_sizeHintCache.at(i);
|
newLogicalHeightHintCache[newIndex] = m_logicalHeightHintCache.at(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_sizeHintCache = newSizeHintCache;
|
m_logicalHeightHintCache = newLogicalHeightHintCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray>& roles)
|
void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray>& roles)
|
||||||
{
|
{
|
||||||
Q_UNUSED(roles);
|
Q_UNUSED(roles);
|
||||||
while (count) {
|
while (count) {
|
||||||
m_sizeHintCache[index] = QSizeF();
|
m_logicalHeightHintCache[index] = 0.0;
|
||||||
++index;
|
++index;
|
||||||
--count;
|
--count;
|
||||||
}
|
}
|
||||||
|
@ -140,14 +141,14 @@ void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QB
|
||||||
|
|
||||||
void KItemListSizeHintResolver::clearCache()
|
void KItemListSizeHintResolver::clearCache()
|
||||||
{
|
{
|
||||||
m_sizeHintCache.fill(QSizeF());
|
m_logicalHeightHintCache.fill(0.0);
|
||||||
m_needsResolving = true;
|
m_needsResolving = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KItemListSizeHintResolver::updateCache()
|
void KItemListSizeHintResolver::updateCache()
|
||||||
{
|
{
|
||||||
if (m_needsResolving) {
|
if (m_needsResolving) {
|
||||||
m_itemListView->calculateItemSizeHints(m_sizeHintCache);
|
m_itemListView->calculateItemSizeHints(m_logicalHeightHintCache, m_logicalWidthHint);
|
||||||
m_needsResolving = false;
|
m_needsResolving = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,8 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const KItemListView* m_itemListView;
|
const KItemListView* m_itemListView;
|
||||||
mutable QVector<QSizeF> m_sizeHintCache;
|
mutable QVector<qreal> m_logicalHeightHintCache;
|
||||||
|
mutable qreal m_logicalWidthHint;
|
||||||
bool m_needsResolving;
|
bool m_needsResolving;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -239,6 +239,7 @@ QRectF KItemListViewLayouter::itemRect(int index) const
|
||||||
// to get the physical horizontal direction
|
// to get the physical horizontal direction
|
||||||
QPointF pos(y, x);
|
QPointF pos(y, x);
|
||||||
pos.rx() -= m_scrollOffset;
|
pos.rx() -= m_scrollOffset;
|
||||||
|
sizeHint.transpose();
|
||||||
return QRectF(pos, sizeHint);
|
return QRectF(pos, sizeHint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -282,7 +283,9 @@ QRectF KItemListViewLayouter::groupHeaderRect(int index) const
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const qreal itemWidth = m_sizeHintResolver->sizeHint(index).width();
|
const qreal itemWidth = (m_scrollOrientation == Qt::Vertical)
|
||||||
|
? m_sizeHintResolver->sizeHint(index).width()
|
||||||
|
: m_sizeHintResolver->sizeHint(index).height();
|
||||||
|
|
||||||
if (itemWidth > headerWidth) {
|
if (itemWidth > headerWidth) {
|
||||||
headerWidth = itemWidth;
|
headerWidth = itemWidth;
|
||||||
|
@ -461,7 +464,7 @@ void KItemListViewLayouter::doLayout()
|
||||||
while (index < itemCount && column < m_columnCount) {
|
while (index < itemCount && column < m_columnCount) {
|
||||||
qreal requiredItemHeight = itemSize.height();
|
qreal requiredItemHeight = itemSize.height();
|
||||||
const QSizeF sizeHint = m_sizeHintResolver->sizeHint(index);
|
const QSizeF sizeHint = m_sizeHintResolver->sizeHint(index);
|
||||||
const qreal sizeHintHeight = horizontalScrolling ? sizeHint.width() : sizeHint.height();
|
const qreal sizeHintHeight = sizeHint.height();
|
||||||
if (sizeHintHeight > requiredItemHeight) {
|
if (sizeHintHeight > requiredItemHeight) {
|
||||||
requiredItemHeight = sizeHintHeight;
|
requiredItemHeight = sizeHintHeight;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,13 @@ set(kitemsettest_SRCS
|
||||||
kde4_add_unit_test(kitemsettest TEST ${kitemsettest_SRCS})
|
kde4_add_unit_test(kitemsettest TEST ${kitemsettest_SRCS})
|
||||||
target_link_libraries(kitemsettest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
|
target_link_libraries(kitemsettest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
|
||||||
|
|
||||||
|
# KItemRangeTest
|
||||||
|
set(kitemrangetest_SRCS
|
||||||
|
kitemrangetest.cpp
|
||||||
|
)
|
||||||
|
kde4_add_unit_test(kitemrangetest TEST ${kitemrangetest_SRCS})
|
||||||
|
target_link_libraries(kitemrangetest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
|
||||||
|
|
||||||
# KItemListSelectionManagerTest
|
# KItemListSelectionManagerTest
|
||||||
set(kitemlistselectionmanagertest_SRCS
|
set(kitemlistselectionmanagertest_SRCS
|
||||||
kitemlistselectionmanagertest.cpp
|
kitemlistselectionmanagertest.cpp
|
||||||
|
|
|
@ -95,6 +95,7 @@ private slots:
|
||||||
void testRefreshFilteredItems();
|
void testRefreshFilteredItems();
|
||||||
void testCollapseFolderWhileLoading();
|
void testCollapseFolderWhileLoading();
|
||||||
void testCreateMimeData();
|
void testCreateMimeData();
|
||||||
|
void testDeleteFileMoreThanOnce();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QStringList itemsInModel() const;
|
QStringList itemsInModel() const;
|
||||||
|
@ -1697,6 +1698,27 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
|
||||||
QVERIFY(!m_model->isExpanded(1));
|
QVERIFY(!m_model->isExpanded(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void KFileItemModelTest::testDeleteFileMoreThanOnce()
|
||||||
|
{
|
||||||
|
QStringList files;
|
||||||
|
files << "a.txt" << "b.txt" << "c.txt" << "d.txt";
|
||||||
|
m_testDir->createFiles(files);
|
||||||
|
|
||||||
|
m_model->loadDirectory(m_testDir->url());
|
||||||
|
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
|
||||||
|
QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt" << "d.txt");
|
||||||
|
|
||||||
|
const KFileItem fileItemB = m_model->fileItem(1);
|
||||||
|
|
||||||
|
// Tell the model that a list of items has been deleted, where "b.txt" appears twice in the list.
|
||||||
|
KFileItemList list;
|
||||||
|
list << fileItemB << fileItemB;
|
||||||
|
m_model->slotItemsDeleted(list);
|
||||||
|
|
||||||
|
QVERIFY(m_model->isConsistent());
|
||||||
|
QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "c.txt" << "d.txt");
|
||||||
|
}
|
||||||
|
|
||||||
QStringList KFileItemModelTest::itemsInModel() const
|
QStringList KFileItemModelTest::itemsInModel() const
|
||||||
{
|
{
|
||||||
QStringList items;
|
QStringList items;
|
||||||
|
|
75
src/tests/kitemrangetest.cpp
Normal file
75
src/tests/kitemrangetest.cpp
Normal file
|
@ -0,0 +1,75 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (C) 2014 by Frank Reininghaus <frank78ac@googlemail.com> *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
* it under the terms of the GNU General Public License as published by *
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or *
|
||||||
|
* (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This program is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with this program; if not, write to the *
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include <qtest_kde.h>
|
||||||
|
|
||||||
|
#include "kitemviews/kitemrange.h"
|
||||||
|
|
||||||
|
#include <QVector>
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(QVector<int>);
|
||||||
|
Q_DECLARE_METATYPE(KItemRangeList);
|
||||||
|
|
||||||
|
class KItemRangeTest : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void testFromSortedContainer_data();
|
||||||
|
void testFromSortedContainer();
|
||||||
|
};
|
||||||
|
|
||||||
|
void KItemRangeTest::testFromSortedContainer_data()
|
||||||
|
{
|
||||||
|
QTest::addColumn<QVector<int> >("sortedNumbers");
|
||||||
|
QTest::addColumn<KItemRangeList>("expected");
|
||||||
|
|
||||||
|
QTest::newRow("empty") << QVector<int>() << KItemRangeList();
|
||||||
|
QTest::newRow("[1]") << (QVector<int>() << 1) << (KItemRangeList() << KItemRange(1, 1));
|
||||||
|
QTest::newRow("[9]") << (QVector<int>() << 9) << (KItemRangeList() << KItemRange(9, 1));
|
||||||
|
QTest::newRow("[1-2]") << (QVector<int>() << 1 << 2) << (KItemRangeList() << KItemRange(1, 2));
|
||||||
|
QTest::newRow("[1-3]") << (QVector<int>() << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
|
||||||
|
QTest::newRow("[1] [4]") << (QVector<int>() << 1 << 4) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(4, 1));
|
||||||
|
QTest::newRow("[1-3] [5]") << (QVector<int>() << 1 << 2 << 3 << 5) << (KItemRangeList() << KItemRange(1, 3) << KItemRange(5, 1));
|
||||||
|
QTest::newRow("[1] [5-6]") << (QVector<int>() << 1 << 5 << 6) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2));
|
||||||
|
QTest::newRow("duplicates: 1 1") << (QVector<int>() << 1 << 1) << (KItemRangeList() << KItemRange(1, 1));
|
||||||
|
QTest::newRow("duplicates: 1 1 1") << (QVector<int>() << 1 << 1 << 1) << (KItemRangeList() << KItemRange(1, 1));
|
||||||
|
QTest::newRow("duplicates: 1 1 5") << (QVector<int>() << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
|
||||||
|
QTest::newRow("duplicates: 1 5 5") << (QVector<int>() << 1 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
|
||||||
|
QTest::newRow("duplicates: 1 1 1 5") << (QVector<int>() << 1 << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
|
||||||
|
QTest::newRow("duplicates: 1 5 5 5") << (QVector<int>() << 1 << 5 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
|
||||||
|
QTest::newRow("duplicates: 1 1 2") << (QVector<int>() << 1 << 1 << 2) << (KItemRangeList() << KItemRange(1, 2));
|
||||||
|
QTest::newRow("duplicates: 1 2 2") << (QVector<int>() << 1 << 2 << 2) << (KItemRangeList() << KItemRange(1, 2));
|
||||||
|
QTest::newRow("duplicates: 1 1 2 3") << (QVector<int>() << 1 << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
|
||||||
|
QTest::newRow("duplicates: 1 2 2 3") << (QVector<int>() << 1 << 2 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
|
||||||
|
QTest::newRow("duplicates: 1 2 3 3") << (QVector<int>() << 1 << 2 << 3 << 3) << (KItemRangeList() << KItemRange(1, 3));
|
||||||
|
}
|
||||||
|
|
||||||
|
void KItemRangeTest::testFromSortedContainer()
|
||||||
|
{
|
||||||
|
QFETCH(QVector<int>, sortedNumbers);
|
||||||
|
QFETCH(KItemRangeList, expected);
|
||||||
|
|
||||||
|
const KItemRangeList result = KItemRangeList::fromSortedContainer(sortedNumbers);
|
||||||
|
QCOMPARE(expected, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_KDEMAIN(KItemRangeTest, NoGUI)
|
||||||
|
|
||||||
|
#include "kitemrangetest.moc"
|
Loading…
Reference in a new issue