summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3drenderer.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-11-22 07:56:04 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-11-22 08:30:09 +0200
commit3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 (patch)
tree6ae0bb7c1ff8720f6340453b39d481ffcf526127 /src/datavisualization/engine/abstract3drenderer.cpp
parentd12f993ca802ff02091d6a5141d2847641bc65a8 (diff)
User-modifiable themes, part 1
Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 0f1349d1..cd4f15b8 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -130,7 +130,7 @@ void Abstract3DRenderer::render(const GLuint defaultFboHandle)
m_cachedScene->viewport().width(),
m_cachedScene->viewport().height());
- QVector3D clearColor = Utils::vectorFromColor(m_cachedTheme.m_windowColor);
+ QVector3D clearColor = Utils::vectorFromColor(m_cachedTheme->windowColor());
glClearColor(clearColor.x(), clearColor.y(), clearColor.z(), 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
@@ -164,9 +164,9 @@ void Abstract3DRenderer::updatePosition(const QRect &boundingRect)
m_cachedBoundingRect = boundingRect;
}
-void Abstract3DRenderer::updateTheme(Theme theme)
+void Abstract3DRenderer::updateTheme(Q3DTheme *theme)
{
- m_cachedTheme.setFromTheme(theme);
+ m_cachedTheme = theme;
m_drawer->setTheme(m_cachedTheme);