Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 34 insertions, 4 deletions

diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp
index 564faa6..c156753 100644
--- a/src/declarative/fx/qfxrect.cpp
+++ b/src/declarative/fx/qfxrect.cpp
@@ -133,6 +133,12 @@ void QFxPen::setWidth(int w)
     Sets a \e color at a \e position in a gradient.
 */
 
+void QFxGradientStop::updateGradient()
+{
+    if (QFxGradient *grad = qobject_cast<QFxGradient*>(parent()))
+        grad->doUpdate();
+}
+
 /*!
     \qmlclass Gradient QFxGradient
     \brief The Gradient item defines a gradient fill.
@@ -171,6 +177,13 @@ const QGradient *QFxGradient::gradient() const
     return m_gradient;
 }
 
+void QFxGradient::doUpdate()
+{
+    delete m_gradient;
+    m_gradient = 0;
+    emit updated();
+}
+
 QML_DEFINE_TYPE(QFxRect,Rect)
 
 /*!
@@ -308,7 +321,14 @@ QFxGradient *QFxRect::gradient() const
 void QFxRect::setGradient(QFxGradient *gradient)
 {
     Q_D(QFxRect);
+    if (d->gradient == gradient)
+        return;
+    if (d->gradient)
+        disconnect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
     d->gradient = gradient;
+    if (d->gradient)
+        connect(d->gradient, SIGNAL(updated()), this, SLOT(doUpdate()));
+    update();
 }
 
 
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h
index 2c59914..c279a1c 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qfxrect.h
@@ -90,10 +90,13 @@ public:
     QFxGradientStop(QObject *parent=0) : QObject(parent) {}
 
     qreal position() const { return m_position; }
-    void setPosition(qreal position) { m_position = position; }
+    void setPosition(qreal position) { m_position = position; updateGradient(); }
 
     QColor color() const { return m_color; }
-    void setColor(const QColor &color) { m_color = color; }
+    void setColor(const QColor &color) { m_color = color; updateGradient(); }
+
+private:
+    void updateGradient();
 
 private:
     qreal m_position;
@@ -109,16 +112,23 @@ class Q_DECLARATIVE_EXPORT QFxGradient : public QObject
     Q_CLASSINFO("DefaultProperty", "stops")
 
 public:
-    QFxGradient(QObject *parent=0) : QObject(parent), m_gradient(0), m_created(false) {}
+    QFxGradient(QObject *parent=0) : QObject(parent), m_gradient(0) {}
+    ~QFxGradient() { delete m_gradient; }
 
     QList<QFxGradientStop *> *stops() { return &m_stops; }
 
     const QGradient *gradient() const;
 
+Q_SIGNALS:
+    void updated();
+
+private:
+    void doUpdate();
+
 private:
     QList<QFxGradientStop *> m_stops;
     mutable QGradient *m_gradient;
-    mutable bool m_created;
+    friend class QFxGradientStop;
 };
 QML_DECLARE_TYPE(QFxGradient)