Various fixes in tables

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qgraphicstableview.cpp b/src/qgraphicstableview.cpp
index 97de041..d79ab58 100644
--- a/src/qgraphicstableview.cpp
+++ b/src/qgraphicstableview.cpp
@@ -137,7 +137,7 @@ void QtGraphicsTableViewItem::paint(QPainter *painter, const QStyleOptionGraphic
     Q_D(QtGraphicsTableViewItem);
     d->view->initStyleOption(&d->option);
     d->view->initStyleOption(&d->option, d->row, d->column);
-    d->option.rect = QRect(QPoint(0, 0), d->view->cellSize(d->row, d->column).toSize());
+    d->option.rect = QRectF(QPointF(), size()).toRect();
     d->view->copyStyleOptionState(option, &d->option);
     //style()->drawControl(QStyle::CE_ItemViewItem, &d->option, painter, widget);
     d->view->paintCell(painter, &d->option, d->row, d->column);
@@ -1228,9 +1228,8 @@ void QtGraphicsTableView::initStyleOption(QStyleOptionViewItemV4 *option, int ro
             break;
         default: {
             QString text = value.toString();
-            const QChar nl = QLatin1Char('\n');
             for (int i = 0; i < text.count(); ++i)
-                if (text.at(i) == nl)
+                if (text.at(i).unicode() == '\n')
                     text[i] = QChar::LineSeparator;
             option->text = text;
             break; }
@@ -1330,7 +1329,7 @@ void QtGraphicsTableView::doLayout()
     qreal y = verticalOffset;
     QSet<QtGraphicsTableViewItem*> itemsVisualized;// tracks all items we show allowing us to recycle all the rest.
     for (int visualRow = d->firstRow; visualRow <= maxRow; ++visualRow) {
-        x = horizontalOffset;
+        x = -horizontalOffset;
         const int effectiveRow = verticalMapping.value(visualRow, visualRow);
         const qreal height = rowHeight(effectiveRow);
         QtGraphicsTableViewItem *item = 0;