diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-17 10:24:02 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-17 11:00:21 +0200 |
| commit | 631b1913f4115fc163a21fc8aba85b87b10a666a (patch) | |
| tree | 5b7f8aff2f79abba2d2d2796e8340be9d352098d /src/datavisualization/engine/drawer_p.h | |
| parent | edb2cdbf30efe9bc8aec0aa89161c620899d3b4c (diff) | |
Optimize theme update
Do not reinitialize shaders in theme update and only update
drawer if label related items change.
Also fix the bug automerge slipped in in recent rebase.
Task-number: QTRD-2778
Change-Id: I4c4317dd36a8e8b60dcaec224f45df81c2ae7f54
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/drawer_p.h')
| -rw-r--r-- | src/datavisualization/engine/drawer_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index ba9aadf7..d91c48fa 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -70,9 +70,7 @@ public: void setTheme(Q3DTheme *theme); Q3DTheme *theme() const; - void setFont(const QFont &font); QFont font() const; - void setLabelBackground(bool enabled); void drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLuint textureId = 0, GLuint depthTextureId = 0); @@ -94,8 +92,6 @@ Q_SIGNALS: private: Q3DTheme *m_theme; - QFont m_font; - bool m_labelBackground; TextureHelper *m_textureHelper; GLuint m_pointbuffer; }; |