Adjust background margins based on angular labels and title

Also separated the vertical and horizontal background margins.

Task-number: QTRD-3184
Change-Id: I988217d4df7749585dd85b5ea8f3f50254dca6ad
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index db174a0d..7a547042 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -56,11 +56,12 @@ private:
     ShaderHelper *m_surfaceSliceSmoothShader;
     ShaderHelper *m_selectionShader;
     ShaderHelper *m_labelShader;
-    GLfloat m_heightNormalizer;
-    GLfloat m_scaleX;
-    GLfloat m_scaleZ;
-    GLfloat m_scaleXWithBackground;
-    GLfloat m_scaleZWithBackground;
+    float m_heightNormalizer;
+    float m_scaleX;
+    float m_scaleZ;
+    float m_scaleXWithBackground;
+    float m_scaleYWithBackground;
+    float m_scaleZWithBackground;
     GLuint m_depthModelTexture;
     GLuint m_depthFrameBuffer;
     GLuint m_selectionFrameBuffer;
@@ -97,6 +98,10 @@ public:
     inline QPoint clickedPosition() const { return m_clickedPosition; }
     void resetClickedStatus();
     QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);
+    void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation,
+                          const QStringList &labels);
+    void updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientation orientation,
+                                   bool visible);
 
     void render(GLuint defaultFboHandle = 0);