Fix labels and grid lines changing size when aspect ratio is changed

Since shaders needed fixing anyway for surface because of this,
also implements the support for object gradients for surface,
which was missing.

Task-number: QTRD-2666
Task-number: QTRD-3211
Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 15 insertions, 4 deletions

diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 1f5a2f8f..0bf63a2f 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -606,19 +606,30 @@ void GraphModifier::adjustZMin(int min)
 
 void GraphModifier::gradientPressed()
 {
+    static Q3DTheme::ColorStyle colorStyle = Q3DTheme::ColorStyleUniform;
+
+    if (colorStyle == Q3DTheme::ColorStyleRangeGradient) {
+        colorStyle = Q3DTheme::ColorStyleObjectGradient;
+        qDebug() << "Color style: ColorStyleObjectGradient";
+    } else if (colorStyle == Q3DTheme::ColorStyleObjectGradient) {
+        colorStyle = Q3DTheme::ColorStyleUniform;
+        qDebug() << "Color style: ColorStyleUniform";
+    } else {
+        colorStyle = Q3DTheme::ColorStyleRangeGradient;
+        qDebug() << "Color style: ColorStyleRangeGradient";
+    }
+
     QLinearGradient gradient;
     gradient.setColorAt(0.0, Qt::black);
     gradient.setColorAt(0.33, Qt::blue);
     gradient.setColorAt(0.67, Qt::red);
     gradient.setColorAt(1.0, Qt::yellow);
-//    m_graph->seriesList().at(0)->setBaseGradient(gradient);
-//    m_graph->seriesList().at(0)->setSingleHighlightColor(Qt::red);
-//    m_graph->seriesList().at(0)->setColorStyle(Q3DTheme::ColorStyleRangeGradient);
 
     QList<QLinearGradient> gradients;
     gradients << gradient;
     m_graph->activeTheme()->setBaseGradients(gradients);
-    m_graph->activeTheme()->setColorStyle(Q3DTheme::ColorStyleRangeGradient);
+    m_graph->activeTheme()->setColorStyle(colorStyle);
+
 }
 
 void GraphModifier::changeFont(const QFont &font)