diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:09:25 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:48:38 +0200 |
| commit | beb856b0b003768e918313407d299c925cf029a9 (patch) | |
| tree | 900757afd348bb8423a527f1db43d698fd1dff45 /src/charts/areachart/areachartitem.cpp | |
| parent | 2c594640231592d59654a9b1164f3278fa736e16 (diff) | |
| parent | 8b79dba3fd204ca4161ec7e7293cb95d698ce9db (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I2cb3defb9f1fc8c8bf1e3ac512cb2e6873db8e39
Diffstat (limited to 'src/charts/areachart/areachartitem.cpp')
| -rw-r--r-- | src/charts/areachart/areachartitem.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/charts/areachart/areachartitem.cpp b/src/charts/areachart/areachartitem.cpp index e4ebf80a..0c61e0fe 100644 --- a/src/charts/areachart/areachartitem.cpp +++ b/src/charts/areachart/areachartitem.cpp @@ -198,8 +198,13 @@ void AreaChartItem::handleUpdated() m_pointLabelsVisible = m_series->pointLabelsVisible(); m_pointLabelsFont = m_series->pointLabelsFont(); m_pointLabelsColor = m_series->pointLabelsColor(); + bool labelClippingChanged = m_pointLabelsClipping != m_series->pointLabelsClipping(); m_pointLabelsClipping = m_series->pointLabelsClipping(); - update(); + // Update whole chart in case label clipping changed as labels can be outside series area + if (labelClippingChanged) + m_series->chart()->update(); + else + update(); } void AreaChartItem::handleDomainUpdated() |