Mystery meat layout hack to get things aligned

Forkk · Mar 25, 2013 · d2eef69 · d2eef69
1 parent 37852d4
commit d2eef69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -73,7 +73,7 @@ MainWindow::MainWindow ( QWidget *parent ) :
 	pal.setBrush(QPalette::Base, QBrush(QPixmap(QString::fromUtf8(":/backgrounds/kitteh"))));
 	view->setPalette(pal);
 	*/
-
+	/*
 	view->setStyleSheet(
 		"QListView\
 		{\
@@ -84,7 +84,7 @@ MainWindow::MainWindow ( QWidget *parent ) :
 			background-repeat: none;\
 			background-color:palette(base);\
 		}");
-
+	*/
 	view->setSelectionMode ( QAbstractItemView::SingleSelection );
 	//view->setSpacing( KDialog::spacingHint() );
 	view->setCategoryDrawer ( drawer );
@@ -97,7 +97,6 @@ MainWindow::MainWindow ( QWidget *parent ) :
 	auto delegate = new ListViewDelegate();
 	view->setItemDelegate(delegate);
 	view->setSpacing(10);
-	//view->setCategorySpacing(10);
 	view->setUniformItemWidths(true);
 
 	model = new InstanceModel ( instList,this );

diff --git a/libgroupview/src/kcategorizedview.cpp b/libgroupview/src/kcategorizedview.cpp
@@ -452,7 +452,8 @@ void KCategorizedView::Private::leftToRightVisualRect ( const QModelIndex &index
 		{
 			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();
@@ -1314,7 +1315,8 @@ QModelIndex KCategorizedView::moveCursor ( CursorAction cursorAction,
 			const QSize itemSize = d->hasGrid() ? gridSize()
 			                       : sizeHintForIndex ( current );
 			const Private::Block &block = d->blocks[d->categoryForIndex ( current )];
-			const int maxItemsPerRow = qMax ( ( d->viewportWidth() - spacing() ) / ( itemSize.width() + spacing() ), 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();
 
@@ -1354,7 +1356,8 @@ QModelIndex KCategorizedView::moveCursor ( CursorAction cursorAction,
 			const QSize itemSize = d->hasGrid() ? gridSize()
 			                       : sizeHintForIndex ( current );
 			const Private::Block &block = d->blocks[d->categoryForIndex ( current )];
-			const int maxItemsPerRow = qMax ( ( d->viewportWidth() - spacing() ) / ( itemSize.width() + spacing() ), 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 )