Commit 4b056cf3 authored by Dimitrios Apostolou's avatar Dimitrios Apostolou
Browse files

Revert "Fix X axis labels to not draw over each other"

This reverts commit 5b6e1042

.
It is reverted because it caused QTBUG-94998 (missing labels
at the edges of axis).
This revert reintroduces QTBUG-79218 (axis labels drawing over
each other).
A followup patch will fix it differently.

Fixes: QTBUG-94998
Task-number: QTBUG-79218
Pick-to: 5.15 6.1 6.2
Change-Id: I0dbb7e0a345feb9986bcf5d1d3e24d8dbea2277b
Reviewed-by: default avatarMiikka Heikkinen <miikka.heikkinen@qt.io>
parent 1ba0ef01
......@@ -193,18 +193,14 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry,
if (leftSqueezeRatio < 1.0)
width *= leftSqueezeRatio;
leftOffset+=width;
axis->setGeometry(QRect(chartRect.left() - leftOffset, chartRect.top(),
width, chartRect.bottom()),
chartRect);
axis->setGeometry(QRect(chartRect.left()-leftOffset, geometry.top(),width, geometry.bottom()),chartRect);
break;
}
case Qt::AlignRight:{
qreal width = size.width();
if (rightSqueezeRatio < 1.0)
width *= rightSqueezeRatio;
axis->setGeometry(QRect(chartRect.right() + rightOffset, chartRect.top(),
width, chartRect.bottom()),
chartRect);
axis->setGeometry(QRect(chartRect.right()+rightOffset,geometry.top(),width,geometry.bottom()),chartRect);
rightOffset+=width;
break;
}
......@@ -212,9 +208,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry,
qreal height = size.height();
if (topSqueezeRatio < 1.0)
height *= topSqueezeRatio;
axis->setGeometry(QRect(chartRect.left(), chartRect.top() - topOffset - height,
chartRect.width(), height),
chartRect);
axis->setGeometry(QRect(geometry.left(), chartRect.top() - topOffset - height, geometry.width(), height), chartRect);
topOffset += height;
break;
}
......@@ -222,9 +216,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry,
qreal height = size.height();
if (bottomSqueezeRatio < 1.0)
height *= bottomSqueezeRatio;
axis->setGeometry(QRect(chartRect.left(), chartRect.bottom() + bottomOffset,
chartRect.width(), height),
chartRect);
axis->setGeometry(QRect(geometry.left(), chartRect.bottom() + bottomOffset, geometry.width(), height), chartRect);
bottomOffset += height;
break;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment