make dataview headers look nice

Author: JorisGoosen

Desktop/components/JASP/Widgets/DataTableViewColumnHeader.qml

@@ -12,6 +12,9 @@ Rectangle
 				) 
 				? jaspTheme.itemSelectedNoFocusColor 
 				: jaspTheme.buttonColor
+	
+	border.width: 1
+	border.color: jaspTheme.borderColor
 
 	readonly	property int	__iconDim:			baseBlockDim * preferencesModel.uiScale
 

QMLComponents/datasetviewbase.cpp

@@ -613,17 +613,17 @@ void DataSetViewBase::buildNewLinesAndCreateNewItems()
 	JASPTIMER_STOP(DataSetViewBase::buildNewLinesAndCreateNewItems_GRID);
 
 #ifdef ADD_LINES_PLEASE
-	addLine(_viewportX + 0.5f,					_viewportY,							_viewportX + 0.5f,					_viewportY + _viewportH);
+	addLine(_viewportX ,					_viewportY,							_viewportX ,					_viewportY + _viewportH);
 	addLine(_viewportX + _rowNumberMaxWidth,	_viewportY,							_viewportX + _rowNumberMaxWidth,	_viewportY + _viewportH);
 
-	addLine(_viewportX,							_viewportY + 0.5f,					_viewportX + _viewportW,			_viewportY+ 0.5f);
+	addLine(_viewportX,							_viewportY ,					_viewportX + _viewportW,			_viewportY);
 	addLine(_viewportX,							_viewportY + _dataRowsMaxHeight,	_viewportX + _viewportW,			_viewportY + _dataRowsMaxHeight);
 
 	//if(_extraColumnItem != nullptr && !expandDataSet())
 	//{
 	//	addLine(_viewportX + _viewportW - extraColumnWidth(),	_viewportY,		_viewportX + _viewportW - extraColumnWidth(),	_viewportY + _dataRowsMaxHeight);
 	//	addLine(_viewportX + _viewportW,						_viewportY,		_viewportX + _viewportW,						_viewportY + _dataRowsMaxHeight);
-	//}
+	//}z
 #endif
 
 	for(int row=_currentViewportRowMin; row<_currentViewportRowMax; row++)
@@ -664,6 +664,13 @@ void DataSetViewBase::buildNewLinesAndCreateNewItems()
 
 		if(col == _model->columnCount() - 1 && pos1x  > _rowNumberMaxWidth + _viewportX && pos1x <= maxXForVerticalLine)
 			addLine(pos1x, pos0y, pos1x, pos1y);
+		
+		if(pos0x  > _rowNumberMaxWidth + _viewportX && pos1x > pos0x && pos1x <= maxXForVerticalLine)
+		{
+			addLine(pos0x, pos0y, pos1x, pos0y);
+			addLine(pos0x, pos1y, pos1x, pos1y);
+		}
+		
 #endif
 	}
 
@@ -774,7 +781,7 @@ void DataSetViewBase::setTextItemInfo(int row, int col, QQuickItem * textItem)
 	textItem->setX(desiredX							+ _itemHorizontalPadding);
 	textItem->setY(((row + 1) * _dataRowsMaxHeight)	+ _itemVerticalPadding);
 
-	textItem->setZ(-4);
+	textItem->setZ(-4.5);
 	textItem->setVisible(true);
 }
 
@@ -865,8 +872,8 @@ QQuickItem * DataSetViewBase::createRowNumber(int row)
 
 		//rowNumber->setProperty("text", QString::fromStdString(std::to_string(row + 1))); //Nobody wants zero-based rows...
 
-		rowNumber->setHeight(_dataRowsMaxHeight		- 1);
-		rowNumber->setWidth(_rowNumberMaxWidth		- 1);
+		rowNumber->setHeight(_dataRowsMaxHeight	- 2);
+		rowNumber->setWidth(_rowNumberMaxWidth	- 2);
 
 		rowNumber->setVisible(true);
 
@@ -875,9 +882,9 @@ QQuickItem * DataSetViewBase::createRowNumber(int row)
 	else
 		rowNumber = _rowNumberItems[row]->item;
 
-	rowNumber->setX(0.5 + _viewportX);
-	rowNumber->setY(0.5 + _dataRowsMaxHeight * (1 + row));
-	rowNumber->setZ(-3);
+	rowNumber->setX(1 + _viewportX);
+	rowNumber->setY(1 + _dataRowsMaxHeight * (1 + row));
+	rowNumber->setZ(-4);
 
 	return _rowNumberItems[row]->item;
 }
@@ -967,8 +974,8 @@ QQuickItem * DataSetViewBase::createColumnHeader(int col)
 		}
 
 
-		columnHeader->setHeight(_dataRowsMaxHeight    - 1);
-		columnHeader->setWidth(_dataColsMaxWidth[col] - 1);
+		columnHeader->setHeight(_dataRowsMaxHeight		);
+		columnHeader->setWidth(_dataColsMaxWidth[col]	);
 
 		columnHeader->setVisible(true);
 
@@ -977,9 +984,9 @@ QQuickItem * DataSetViewBase::createColumnHeader(int col)
 	else
 		columnHeader = _columnHeaderItems[col]->item;
 
-	columnHeader->setX(0.5 + _colXPositions[col]);
-	columnHeader->setY(0.5 + _viewportY);
-	columnHeader->setZ(-3);
+	columnHeader->setX(_colXPositions[col]);
+	columnHeader->setY(_viewportY);
+	columnHeader->setZ(-4);
 
 	return columnHeader;
 }
@@ -1025,11 +1032,11 @@ QQuickItem * DataSetViewBase::createleftTopCorner()
 		_leftTopItem->setVisible(true);
 	}
 
-	_leftTopItem->setHeight(_dataRowsMaxHeight - 1);
-	_leftTopItem->setWidth(_rowNumberMaxWidth  - 1);
-	_leftTopItem->setX(_viewportX + 0.5);
-	_leftTopItem->setY(_viewportY + 0.5);
-	_leftTopItem->setZ(-1);
+	_leftTopItem->setHeight(_dataRowsMaxHeight - 2);
+	_leftTopItem->setWidth(_rowNumberMaxWidth  - 2);
+	_leftTopItem->setX(_viewportX + 1);
+	_leftTopItem->setY(_viewportY + 1);
+	_leftTopItem->setZ(-3);
 
 	return _leftTopItem;
 }