From 39c5cdc6f89e8f17afb6b9548d39a80348777544 Mon Sep 17 00:00:00 2001 From: Kwanghyo Park Date: Mon, 18 Aug 2025 12:07:21 +0300 Subject: [PATCH] Decouple pie and hole size setters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes logic that caused setPieSize() and setHoleSize() to implicitly modify each other. The setters now only affect their own respective properties. Pick-to: 6.9 6.8 Fixes: QTBUG-134003 Change-Id: I2d7b3e36d692248cd2de19dc6daa9d09a61c8158 Reviewed-by: Tomi Korpipää Reviewed-by: Kaj Grönholm (cherry picked from commit e2def3779a412502f8add767af427bdfeaa92e98) Reviewed-by: Qt Cherry-pick Bot --- src/graphs2d/piechart/qpieseries.cpp | 4 ++-- tests/auto/cpp2dtest/qgpieseries/tst_qgpieseries.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/graphs2d/piechart/qpieseries.cpp b/src/graphs2d/piechart/qpieseries.cpp index 19e388c3..0996a9d8 100644 --- a/src/graphs2d/piechart/qpieseries.cpp +++ b/src/graphs2d/piechart/qpieseries.cpp @@ -1007,7 +1007,7 @@ void QPieSeries::setPieSize(qreal relativeSize) { Q_D(QPieSeries); relativeSize = qBound((qreal)0.0, relativeSize, (qreal)1.0); - d->setSizes(qMin(d->m_holeRelativeSize, relativeSize), relativeSize); + d->setSizes(d->m_holeRelativeSize, relativeSize); } qreal QPieSeries::pieSize() const @@ -1150,7 +1150,7 @@ void QPieSeries::setHoleSize(qreal holeSize) { Q_D(QPieSeries); holeSize = qBound((qreal)0.0, holeSize, (qreal)1.0); - d->setSizes(holeSize, qMax(d->m_pieRelativeSize, holeSize)); + d->setSizes(holeSize, d->m_pieRelativeSize); } qreal QPieSeries::holeSize() const diff --git a/tests/auto/cpp2dtest/qgpieseries/tst_qgpieseries.cpp b/tests/auto/cpp2dtest/qgpieseries/tst_qgpieseries.cpp index 2e475d97..06754bf2 100644 --- a/tests/auto/cpp2dtest/qgpieseries/tst_qgpieseries.cpp +++ b/tests/auto/cpp2dtest/qgpieseries/tst_qgpieseries.cpp @@ -112,11 +112,11 @@ void tst_qgpieseries::properties() m_series->setHoleSize(0.8); QCOMPARE(m_series->holeSize(), 0.8); - QCOMPARE(m_series->pieSize(), 0.8); + QCOMPARE(m_series->pieSize(), 0.7); m_series->setPieSize(0.4); QCOMPARE(m_series->pieSize(), 0.4); - QCOMPARE(m_series->holeSize(), 0.4); + QCOMPARE(m_series->holeSize(), 0.8); m_series->setStartAngle(0); m_series->setStartAngle(-180);