diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-25 09:13:12 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-25 09:38:45 +0300 |
commit | 39ab7c38ea280626468b02acd396667f7ac5cb44 (patch) | |
tree | f17762120bcee07488b84bf4c6ed1d0a3ee51219 /src/datavisualization/engine | |
parent | b1d028be5bea64a915de13ffcd782e7f5228e47a (diff) |
QML them basecolor override by series bug fixed
Task-number: QTRD-3010
QML calls properties in "random" (or alphabetical) order, which in this
case causes theme initialization to be called after series basecolor
override, so setting a basecolor to a series to override theme did not
work.
Change-Id: I434f2a278bf2a70512a3d4d73c30d80319bd0e8e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 5 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 4c66ad76..31dcab95 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -725,12 +725,13 @@ void Abstract3DController::releaseTheme(Q3DTheme *theme) if (oldTheme != m_themeManager->activeTheme()) emit activeThemeChanged(m_themeManager->activeTheme()); } + QList<Q3DTheme *> Abstract3DController::themes() const { return m_themeManager->themes(); } -void Abstract3DController::setActiveTheme(Q3DTheme *theme) +void Abstract3DController::setActiveTheme(Q3DTheme *theme, bool force) { if (theme != m_themeManager->activeTheme()) { m_themeManager->setActiveTheme(theme); @@ -739,7 +740,7 @@ void Abstract3DController::setActiveTheme(Q3DTheme *theme) Q3DTheme *newActiveTheme = m_themeManager->activeTheme(); // Reset all attached series to the new theme for (int i = 0; i < m_seriesList.size(); i++) - m_seriesList.at(i)->d_ptr->resetToTheme(*newActiveTheme, i, true); + m_seriesList.at(i)->d_ptr->resetToTheme(*newActiveTheme, i, force); markSeriesVisualsDirty(); emit activeThemeChanged(newActiveTheme); } diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index ba91796e..07aa9ca3 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -209,7 +209,7 @@ public: virtual void addTheme(Q3DTheme *theme); virtual void releaseTheme(Q3DTheme *theme); - virtual void setActiveTheme(Q3DTheme *theme); + virtual void setActiveTheme(Q3DTheme *theme, bool force = true); virtual Q3DTheme *activeTheme() const; virtual QList<Q3DTheme *> themes() const; |