kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take in count item sizes. As we want all elements of the same size we check for the biggest one. This way we have visible columns too, what makes everything more ordered,

Browse source 
and to the user eye as well.

svn path=/trunk/KDE/kdebase/apps/; revision=687387
This commit is contained in:
Rafael Fernández López 2007-07-13 13:49:21 +00:00
parent 5c5590846d
commit f93cc2499d
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/kcategorizedview.cpp
View file

@ -78,6 +78,7 @@ private:
KCategorizedView::Private::Private(KCategorizedView *listView)
: listView(listView)
, itemCategorizer(0)
, biggestItemSize(QSize(0, 0))
, mouseButtonPressed(false)
, isDragging(false)
, dragLeftViewport(false)
@ -150,14 +151,8 @@ QRect KCategorizedView::Private::visualRectInViewport(const QModelIndex &index)
int viewportWidth = listView->viewport()->width() - listView->spacing();
// We really need all items to be of same size. Otherwise we cannot do this
// (ereslibre)
// QSize itemSize =
// listView->sizeHintForIndex(proxyModel->mapFromSource(index));
// int itemHeight = itemSize.height();
// int itemWidth = itemSize.width();*/
int itemHeight = 107;
int itemWidth = 130;
int itemHeight = biggestItemSize.height();
int itemWidth = biggestItemSize.width();
int itemWidthPlusSeparation = listView->spacing() + itemWidth;
int elementsPerRow = viewportWidth / itemWidthPlusSeparation;
if (!elementsPerRow)
@ -211,13 +206,8 @@ QRect KCategorizedView::Private::visualCategoryRectInViewport(const QString &cat
int viewportWidth = listView->viewport()->width() - listView->spacing();
// We really need all items to be of same size. Otherwise we cannot do this
// (ereslibre)
// QSize itemSize = listView->sizeHintForIndex(index);
// int itemHeight = itemSize.height();
// int itemWidth = itemSize.width();
int itemHeight = 107;
int itemWidth = 130;
int itemHeight = biggestItemSize.height();
int itemWidth = biggestItemSize.width();
int itemWidthPlusSeparation = listView->spacing() + itemWidth;
int elementsPerRow = viewportWidth / itemWidthPlusSeparation;
@ -947,13 +937,8 @@ QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction,
const QModelIndex current = selectionModel()->currentIndex();
int viewportWidth = viewport()->width() - spacing();
// We really need all items to be of same size. Otherwise we cannot do this
// (ereslibre)
// QSize itemSize = listView->sizeHintForIndex(index);
// int itemHeight = itemSize.height();
// int itemWidth = itemSize.width();
int itemHeight = 107;
int itemWidth = 130;
int itemHeight = d->biggestItemSize.height();
int itemWidth = d->biggestItemSize.width();
int itemWidthPlusSeparation = spacing() + itemWidth;
int elementsPerRow = viewportWidth / itemWidthPlusSeparation;
@ -1119,6 +1104,11 @@ void KCategorizedView::rowsInsertedArtifficial(const QModelIndex &parent,
// Add all elements mapped to the source model
for (int k = 0; k < d->proxyModel->rowCount(); k++)
{
d->biggestItemSize = QSize(qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).width(),
d->biggestItemSize.width()),
qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).height(),
d->biggestItemSize.height()));
d->sourceModelIndexList <<
d->proxyModel->mapToSource(d->proxyModel->index(k, 0));
}

1
src/kcategorizedview_p.h
View file

@ -123,6 +123,7 @@ public:
// Basic data
KCategorizedView *listView;
KItemCategorizer *itemCategorizer;
QSize biggestItemSize;
// Behavior data
bool mouseButtonPressed;