Merge branch 'master' of git://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp

2 files changed, 146 insertions, 127 deletions

diff --git a/libgroupview/src/kcategorizedview.cpp b/libgroupview/src/kcategorizedview.cpp
index 5b7c8d42..4da4271f 100644
--- a/libgroupview/src/kcategorizedview.cpp
+++ b/libgroupview/src/kcategorizedview.cpp
@@ -115,6 +115,7 @@ KCategorizedView::Private::Private ( KCategorizedView *q )
 	, hoveredIndex ( QModelIndex() )
 	, pressedPosition ( QPoint() )
 	, rubberBandRect ( QRect() )
+	, constantItemWidth( 0 )
 {
 }
 
@@ -447,11 +448,12 @@ void KCategorizedView::Private::leftToRightVisualRect ( const QModelIndex &index
 	}
 	else
 	{
-		if ( q->uniformItemSizes() )
+		if ( q->uniformItemSizes() /*|| q->uniformItemWidths()*/ )
 		{
 			const int relativeRow = index.row() - firstIndexRow;
 			const QSize itemSize = q->sizeHintForIndex ( index );
-			const int maxItemsPerRow = qMax ( ( viewportWidth() - q->spacing() ) / ( itemSize.width() + q->spacing() ), 1 );
+			//HACK: Why is the -2 needed?
+			const int maxItemsPerRow = qMax ( ( viewportWidth() - q->spacing() - 2 ) / ( itemSize.width() + q->spacing() ), 1 );
 			if ( q->layoutDirection() == Qt::LeftToRight )
 			{
 				item.topLeft.rx() = ( relativeRow % maxItemsPerRow ) * itemSize.width() + blockPos.x() + categoryDrawer->leftMargin();
@@ -478,7 +480,8 @@ void KCategorizedView::Private::leftToRightVisualRect ( const QModelIndex &index
 					Q_FOREVER
 					{
 						prevIndex = proxyModel->index ( prevIndex.row() - 1, q->modelColumn(), q->rootIndex() );
-						const QRect tempRect = q->visualRect ( prevIndex );
+						QRect tempRect = q->visualRect ( prevIndex );
+						tempRect = mapFromViewport ( tempRect );
 						if ( tempRect.topLeft().y() < prevRect.topLeft().y() )
 						{
 							break;
@@ -622,6 +625,18 @@ void KCategorizedView::setModel ( QAbstractItemModel *model )
 	}
 }
 
+
+void KCategorizedView::setUniformItemWidths(bool enable)
+{
+	d->constantItemWidth = enable;
+}
+
+
+bool KCategorizedView::uniformItemWidths() const
+{
+	return d->constantItemWidth;
+}
+
 void KCategorizedView::setGridSize ( const QSize &size )
 {
 	setGridSizeOwn ( size );
@@ -1294,13 +1309,14 @@ QModelIndex KCategorizedView::moveCursor ( CursorAction cursorAction,
 	}
 	case MoveDown:
 	{
-		if ( d->hasGrid() || uniformItemSizes() )
+		if ( d->hasGrid() || uniformItemSizes() || uniformItemWidths() )
 		{
 			const QModelIndex current = currentIndex();
 			const QSize itemSize = d->hasGrid() ? gridSize()
 			                       : sizeHintForIndex ( current );
 			const Private::Block &block = d->blocks[d->categoryForIndex ( current )];
-			const int maxItemsPerRow = qMax ( d->viewportWidth() / itemSize.width(), 1 );
+			//HACK: Why is the -2 needed?
+			const int maxItemsPerRow = qMax ( ( d->viewportWidth() - spacing() - 2 ) / ( itemSize.width() + spacing() ), 1 );
 			const bool canMove = current.row() + maxItemsPerRow < block.firstIndex.row() +
 			                     block.items.count();
 
@@ -1334,13 +1350,14 @@ QModelIndex KCategorizedView::moveCursor ( CursorAction cursorAction,
 	}
 	case MoveUp:
 	{
-		if ( d->hasGrid() || uniformItemSizes() )
+		if ( d->hasGrid() || uniformItemSizes() || uniformItemWidths() )
 		{
 			const QModelIndex current = currentIndex();
 			const QSize itemSize = d->hasGrid() ? gridSize()
 			                       : sizeHintForIndex ( current );
 			const Private::Block &block = d->blocks[d->categoryForIndex ( current )];
-			const int maxItemsPerRow = qMax ( d->viewportWidth() / itemSize.width(), 1 );
+			//HACK: Why is the -2 needed?
+			const int maxItemsPerRow = qMax ( ( d->viewportWidth() - spacing() - 2 ) / ( itemSize.width() + spacing() ), 1 );
 			const bool canMove = current.row() - maxItemsPerRow >= block.firstIndex.row();
 
 			if ( canMove )
diff --git a/libgroupview/src/kcategorizedview_p.h b/libgroupview/src/kcategorizedview_p.h
index 6dafa382..13809312 100644
--- a/libgroupview/src/kcategorizedview_p.h
+++ b/libgroupview/src/kcategorizedview_p.h
@@ -32,126 +32,128 @@ class KCategoryDrawerV3;
 class KCategorizedView::Private
 {
 public:
-    struct Block;
-    struct Item;
-
-    Private(KCategorizedView *q);
-    ~Private();
-
-    /**
-      * @return whether this view has all required elements to be categorized.
-      */
-    bool isCategorized() const;
-
-    /**
-      * @return the block rect for the representative @p representative.
-      */
-    QStyleOptionViewItemV4 blockRect(const QModelIndex &representative);
-
-    /**
-      * Returns the first and last element that intersects with rect.
-      *
-      * @note see that here we cannot take out items between first and last (as we could
-      *       do with the rubberband).
-      *
-      * Complexity: O(log(n)) where n is model()->rowCount().
-      */
-    QPair<QModelIndex, QModelIndex> intersectingIndexesWithRect(const QRect &rect) const;
-
-    /**
-      * Returns the position of the block of @p category.
-      *
-      * Complexity: O(n) where n is the number of different categories when the block has been
-      *             marked as in quarantine. O(1) the rest of the times (the vast majority).
-      */
-    QPoint blockPosition(const QString &category);
-
-    /**
-      * Returns the height of the block determined by @p category.
-      */
-    int blockHeight(const QString &category);
-
-    /**
-      * Returns the actual viewport width.
-      */
-    int viewportWidth() const;
-
-    /**
-      * Marks all elements as in quarantine.
-      *
-      * Complexity: O(n) where n is model()->rowCount().
-      *
-      * @warning this is an expensive operation
-      */
-    void regenerateAllElements();
-
-    /**
-      * Update internal information, and keep sync with the real information that the model contains.
-      */
-    void rowsInserted(const QModelIndex &parent, int start, int end);
-
-    /**
-      * Returns @p rect in viewport terms, taking in count horizontal and vertical offsets.
-      */
-    QRect mapToViewport(const QRect &rect) const;
-
-    /**
-      * Returns @p rect in absolute terms, converted from viewport position.
-      */
-    QRect mapFromViewport(const QRect &rect) const;
-
-    /**
-      * Returns the height of the highest element in last row. This is only applicable if there is
-      * no grid set and uniformItemSizes is false.
-      *
-      * @param block in which block are we searching. Necessary to stop the search if we hit the
-      *              first item in this block.
-      */
-    int highestElementInLastRow(const Block &block) const;
-
-    /**
-      * Returns whether the view has a valid grid size.
-      */
-    bool hasGrid() const;
-
-    /**
-      * Returns the category for the given index.
-      */
-    QString categoryForIndex(const QModelIndex &index) const;
-
-    /**
-      * Updates the visual rect for item when flow is LeftToRight.
-      */
-    void leftToRightVisualRect(const QModelIndex &index, Item &item,
-                               const Block &block, const QPoint &blockPos) const;
-
-    /**
-      * Updates the visual rect for item when flow is TopToBottom.
-      * @note we only support viewMode == ListMode in this case.
-      */
-    void topToBottomVisualRect(const QModelIndex &index, Item &item,
-                               const Block &block, const QPoint &blockPos) const;
-
-    /**
-      * Called when expand or collapse has been clicked on the category drawer.
-      */
-    void _k_slotCollapseOrExpandClicked(QModelIndex);
-
-    KCategorizedView *q;
-    KCategorizedSortFilterProxyModel *proxyModel;
-    KCategoryDrawer *categoryDrawer;
-    int categorySpacing;
-    bool alternatingBlockColors;
-    bool collapsibleBlocks;
-
-    Block *hoveredBlock;
-    QString hoveredCategory;
-    QModelIndex hoveredIndex;
-
-    QPoint pressedPosition;
-    QRect rubberBandRect;
-
-    QHash<QString, Block> blocks;
+	struct Block;
+	struct Item;
+
+	Private(KCategorizedView *q);
+	~Private();
+
+	/**
+	  * @return whether this view has all required elements to be categorized.
+	  */
+	bool isCategorized() const;
+
+	/**
+	  * @return the block rect for the representative @p representative.
+	  */
+	QStyleOptionViewItemV4 blockRect(const QModelIndex &representative);
+
+	/**
+	  * Returns the first and last element that intersects with rect.
+	  *
+	  * @note see that here we cannot take out items between first and last (as we could
+	  *       do with the rubberband).
+	  *
+	  * Complexity: O(log(n)) where n is model()->rowCount().
+	  */
+	QPair<QModelIndex, QModelIndex> intersectingIndexesWithRect(const QRect &rect) const;
+
+	/**
+	  * Returns the position of the block of @p category.
+	  *
+	  * Complexity: O(n) where n is the number of different categories when the block has been
+	  *             marked as in quarantine. O(1) the rest of the times (the vast majority).
+	  */
+	QPoint blockPosition(const QString &category);
+
+	/**
+	  * Returns the height of the block determined by @p category.
+	  */
+	int blockHeight(const QString &category);
+
+	/**
+	  * Returns the actual viewport width.
+	  */
+	int viewportWidth() const;
+
+	/**
+	  * Marks all elements as in quarantine.
+	  *
+	  * Complexity: O(n) where n is model()->rowCount().
+	  *
+	  * @warning this is an expensive operation
+	  */
+	void regenerateAllElements();
+
+	/**
+	  * Update internal information, and keep sync with the real information that the model contains.
+	  */
+	void rowsInserted(const QModelIndex &parent, int start, int end);
+
+	/**
+	  * Returns @p rect in viewport terms, taking in count horizontal and vertical offsets.
+	  */
+	QRect mapToViewport(const QRect &rect) const;
+
+	/**
+	  * Returns @p rect in absolute terms, converted from viewport position.
+	  */
+	QRect mapFromViewport(const QRect &rect) const;
+
+	/**
+	  * Returns the height of the highest element in last row. This is only applicable if there is
+	  * no grid set and uniformItemSizes is false.
+	  *
+	  * @param block in which block are we searching. Necessary to stop the search if we hit the
+	  *              first item in this block.
+	  */
+	int highestElementInLastRow(const Block &block) const;
+
+	/**
+	  * Returns whether the view has a valid grid size.
+	  */
+	bool hasGrid() const;
+
+	/**
+	  * Returns the category for the given index.
+	  */
+	QString categoryForIndex(const QModelIndex &index) const;
+
+	/**
+	  * Updates the visual rect for item when flow is LeftToRight.
+	  */
+	void leftToRightVisualRect(const QModelIndex &index, Item &item,
+							const Block &block, const QPoint &blockPos) const;
+
+	/**
+	  * Updates the visual rect for item when flow is TopToBottom.
+	  * @note we only support viewMode == ListMode in this case.
+	  */
+	void topToBottomVisualRect(const QModelIndex &index, Item &item,
+							const Block &block, const QPoint &blockPos) const;
+
+	/**
+	  * Called when expand or collapse has been clicked on the category drawer.
+	  */
+	void _k_slotCollapseOrExpandClicked(QModelIndex);
+
+	KCategorizedView *q;
+	KCategorizedSortFilterProxyModel *proxyModel;
+	KCategoryDrawer *categoryDrawer;
+	int categorySpacing;
+	bool alternatingBlockColors;
+	bool collapsibleBlocks;
+	bool constantItemWidth;
+
+	Block *hoveredBlock;
+	QString hoveredCategory;
+	QModelIndex hoveredIndex;
+
+	QPoint pressedPosition;
+	QRect rubberBandRect;
+
+	QHash<QString, Block> blocks;
 };
 
 #endif // KCATEGORIZEDVIEW_P_H
+