diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 10:46:26 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 13:18:41 +0200 |
| commit | 8566d712a87d9e3a78be15b6bd3498c2cf8afe57 (patch) | |
| tree | 6ae292f0fd8c870d997db6d208a531da5f9320f0 /tests/multigraphs | |
| parent | aa842c39480aa5b95f704c97b8b3acc821144883 (diff) | |
Fix setting theme type
Now reset the theme properties immediately to new theme type, instead
of waiting for the theme activation. Also make changing theme type
later work consistently.
Task-number: QTRD-2750
Change-Id: I970d69587623119df33ad2a825fbc12367804eae
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'tests/multigraphs')
| -rw-r--r-- | tests/multigraphs/data.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 177d86b7..7ba5685f 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -45,7 +45,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_started(false) { // Initialize surface - m_surface->setActiveTheme(new Q3DTheme(Q3DTheme::ThemeIsabelle)); + m_surface->activeTheme()->setType(Q3DTheme::ThemeIsabelle); QLinearGradient gradient; gradient.setColorAt(0.0, Qt::black); gradient.setColorAt(0.33, Qt::blue); @@ -63,7 +63,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_surface->addSeries(series1); // Initialize scatter - m_scatter->setActiveTheme(new Q3DTheme(Q3DTheme::ThemeStoneMoss)); + m_scatter->activeTheme()->setType(Q3DTheme::ThemeStoneMoss); m_scatter->setSelectionMode(QDataVis::SelectionNone); m_scatter->activeTheme()->setGridEnabled(false); m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); @@ -73,7 +73,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_scatter->addSeries(series2); // Initialize bars - m_bars->setActiveTheme(new Q3DTheme(Q3DTheme::ThemeQt)); + m_bars->activeTheme()->setType(Q3DTheme::ThemeQt); m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice); m_bars->activeTheme()->setGridEnabled(false); m_bars->setShadowQuality(QDataVis::ShadowQualityLow); @@ -185,10 +185,7 @@ void Data::scrollDown() void Data::useGradientOne() { - Q3DTheme *currentTheme = m_surface->activeTheme(); - m_surface->releaseTheme(currentTheme); - delete currentTheme; - m_surface->setActiveTheme(new Q3DTheme(Q3DTheme::ThemeIsabelle)); + m_surface->activeTheme()->setType(Q3DTheme::ThemeIsabelle); QLinearGradient gradient; gradient.setColorAt(0.0, Qt::black); gradient.setColorAt(0.33, Qt::blue); @@ -201,10 +198,7 @@ void Data::useGradientOne() void Data::useGradientTwo() { - Q3DTheme *currentTheme = m_surface->activeTheme(); - m_surface->releaseTheme(currentTheme); - delete currentTheme; - m_surface->setActiveTheme(new Q3DTheme(Q3DTheme::ThemeQt)); + m_surface->activeTheme()->setType(Q3DTheme::ThemeQt); QLinearGradient gradient; gradient.setColorAt(0.0, Qt::white); gradient.setColorAt(0.8, Qt::red); |