From d85201ec4aa738232e4ef085b78114c744cbcaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 13 Jan 2014 10:07:04 +0200 Subject: Base color/gradient disconnection Task-number: QTRD-2758 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Reviewed-by: Miikka Heikkinen --- src/datavisualizationqml2/declarativetheme.cpp | 18 ++++++++++++++++++ src/datavisualizationqml2/declarativetheme_p.h | 1 + 2 files changed, 19 insertions(+) (limited to 'src') diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp index c494052a..850b2200 100644 --- a/src/datavisualizationqml2/declarativetheme.cpp +++ b/src/datavisualizationqml2/declarativetheme.cpp @@ -29,6 +29,7 @@ DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent) m_dummyGradients(false), m_dummyColors(false) { + connect(this, &Q3DTheme::typeChanged, this, &DeclarativeTheme3D::handleTypeChange); } DeclarativeTheme3D::~DeclarativeTheme3D() @@ -48,6 +49,23 @@ void DeclarativeTheme3D::appendSeriesChildren(QQmlListProperty *list, Q // Nothing to do, seriesChildren is there only to enable scoping gradient items in Theme3D item. } +void DeclarativeTheme3D::handleTypeChange(Theme themeType) +{ + Q_UNUSED(themeType) + + // Theme changed, disconnect base color/gradient connections + if (!m_colors.isEmpty()) { + foreach (DeclarativeColor *item, m_colors) + disconnect(item, 0, this, 0); + m_colors.clear(); + } + if (!m_gradients.isEmpty()) { + foreach (ColorGradient *item, m_gradients) + disconnect(item, 0, this, 0); + m_gradients.clear(); + } +} + void DeclarativeTheme3D::handleBaseColorUpdate() { int colorCount = m_colors.size(); diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 0ec0d1ef..031ab4bb 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -85,6 +85,7 @@ signals: void multiHighlightGradientChanged(ColorGradient *gradient); protected: + void handleTypeChange(Theme themeType); void handleBaseColorUpdate(); void handleBaseGradientUpdate(); void handleSingleHLGradientUpdate(); -- cgit v1.2.3