Fix incorrect plotArea before resize

If plotArea is set inside ChartView, contentGeometry is updated too
early and we end up with incorrect plotArea. Invalidate the layout to
correct the geometry.

Fixes: QTBUG-95870
Change-Id: I761125633bcbb8297e629b3e98d61e7d95975806
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit f78e11381f2dedcab4bda44e52b3c75d810766c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 18 insertions, 7 deletions

diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp
index 98bca1a1..66394900 100644
--- a/src/charts/chartpresenter.cpp
+++ b/src/charts/chartpresenter.cpp
@@ -98,7 +98,7 @@ void ChartPresenter::setFixedGeometry(const QRectF &rect)
 
 void ChartPresenter::setGeometry(const QRectF rect)
 {
-    if (m_rect != rect) {
+    if (rect.isValid() && m_rect != rect) {
         m_rect = rect;
         if (!m_fixedRect.isNull())
             return;
diff --git a/src/charts/domain/abstractdomain.cpp b/src/charts/domain/abstractdomain.cpp
index e3255103..1a867616 100644
--- a/src/charts/domain/abstractdomain.cpp
+++ b/src/charts/domain/abstractdomain.cpp
@@ -58,6 +58,9 @@ AbstractDomain::~AbstractDomain()
 
 void AbstractDomain::setSize(const QSizeF &size)
 {
+    if (!size.isValid())
+        return;
+
     if (m_size != size) {
         m_size=size;
         emit updated();
diff --git a/src/charts/layout/abstractchartlayout.cpp b/src/charts/layout/abstractchartlayout.cpp
index ae1da176..a6c2d716 100644
--- a/src/charts/layout/abstractchartlayout.cpp
+++ b/src/charts/layout/abstractchartlayout.cpp
@@ -53,6 +53,7 @@ void AbstractChartLayout::setGeometry(const QRectF &rect)
 {
     if (!rect.isValid())
         return;
+
     // If the chart has a fixed geometry then don't update visually
     const bool updateLayout = (!m_presenter->isFixedGeometry() || m_presenter->geometry() == rect);
     if (m_presenter->chart()->isVisible()) {
@@ -73,12 +74,14 @@ void AbstractChartLayout::setGeometry(const QRectF &rect)
 
         contentGeometry = calculateAxisGeometry(contentGeometry, axes, updateLayout);
 
-        m_presenter->setGeometry(contentGeometry);
-        if (updateLayout) {
-            if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian)
-                static_cast<QGraphicsRectItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
-            else
-                static_cast<QGraphicsEllipseItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
+        if (contentGeometry.isValid()) {
+            m_presenter->setGeometry(contentGeometry);
+            if (updateLayout) {
+                if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian)
+                    static_cast<QGraphicsRectItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
+                else
+                    static_cast<QGraphicsEllipseItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
+            }
         }
     }
 
diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp
index 4b940e10..d7834d31 100644
--- a/src/chartsqml2/declarativechart.cpp
+++ b/src/chartsqml2/declarativechart.cpp
@@ -61,6 +61,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
 #include <QtQuick/QQuickWindow>
+#include <QtWidgets/QGraphicsLayout>
 
 QT_CHARTS_BEGIN_NAMESPACE
 
@@ -1496,6 +1497,10 @@ QPointF DeclarativeChart::mapToPosition(const QPointF &value, QAbstractSeries *s
 void DeclarativeChart::setPlotArea(const QRectF &rect)
 {
     m_chart->setPlotArea(rect);
+
+    // If plotArea is set inside ChartView, contentGeometry is updated too early and we end up
+    // with incorrect plotArea. Invalidate the layout to correct the geometry.
+    m_chart->layout()->invalidate();
 }
 
 QT_CHARTS_END_NAMESPACE