diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 09:27:38 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 09:36:32 +0200 |
commit | 4588556895bc14803e3ad884e89eb988b751e6be (patch) | |
tree | e0032ad35ba353990272c411732d58d1fc1097aa /src/datavisualization/engine/abstract3dcontroller.cpp | |
parent | 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 (diff) |
Gradients and colors defined for all built-in themes
Task-number: QTRD-2608
Change-Id: Ib6c3b4ec697efc238db9776b3f71c11a0d099c57
Change-Id: Ib6c3b4ec697efc238db9776b3f71c11a0d099c57
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index afe0b124..e185d322 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -684,6 +684,18 @@ void Abstract3DController::setZoomLevel(int zoomLevel) void Abstract3DController::setColorStyle(QDataVis::ColorStyle style) { + if (style != m_colorStyle || m_changeTracker.themeChanged) { + Q3DTheme *theme = m_themeManager->theme(); + if (style == QDataVis::ColorStyleUniform) { + setObjectColor(theme->baseColor()); + setSingleHighlightColor(theme->singleHighlightColor()); + setMultiHighlightColor(theme->multiHighlightColor()); + } else { + setObjectGradient(theme->baseGradient()); + setSingleHighlightGradient(theme->singleHighlightGradient()); + setMultiHighlightGradient(theme->multiHighlightGradient()); + } + } if (style != m_colorStyle) { m_colorStyle = style; m_changeTracker.colorStyleChanged = true; @@ -795,16 +807,6 @@ void Abstract3DController::setTheme(Q3DTheme *theme) m_changeTracker.themeChanged = true; // TODO: set all colors/styles here (QTRD-2538) setColorStyle(colorStyle); - if (colorStyle == QDataVis::ColorStyleUniform) { - setObjectColor(theme->baseColor()); - setSingleHighlightColor(theme->singleHighlightColor()); - setMultiHighlightColor(theme->multiHighlightColor()); - } else { - setObjectGradient(theme->baseGradient()); - setSingleHighlightGradient(theme->singleHighlightGradient()); - setMultiHighlightGradient(theme->multiHighlightGradient()); - } - emit themeChanged(theme); } } |