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

9 files changed, 61 insertions, 18 deletions

diff --git a/src/declarative/fx/qfxflowview.cpp b/src/declarative/fx/qfxflowview.cpp
index e02e186..77cd6df 100644
--- a/src/declarative/fx/qfxflowview.cpp
+++ b/src/declarative/fx/qfxflowview.cpp
@@ -128,10 +128,11 @@ void QFxFlowView::refresh()
 {
     if (m_model && m_columns >= 1) {
         for (int ii = 0; ii < m_model->count(); ++ii) {
-            QFxItem *item = m_model->item(ii);
-            item->setParent(this);
-            item->setZ(0);
-            m_items << item;
+            if (QFxItem *item = m_model->item(ii)) {
+                item->setParent(this);
+                item->setZ(0);
+                m_items << item;
+            }
         }
 
         reflow();
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 0ca9393..a6ffbb9 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -234,6 +234,8 @@ public:
                 int count = columns - 1 - (modelIndex - visibleItems.last()->index - 1) % columns;
                 return visibleItems.last()->colPos() - count * colSize();
             }
+        } else {
+            return (modelIndex % columns) * colSize();
         }
         return 0;
     }
@@ -252,6 +254,8 @@ public:
                 int rows = col / (columns * colSize());
                 return visibleItems.last()->rowPos() + rows * rowSize();
             }
+        } else {
+             return (modelIndex / columns) * rowSize();
         }
         return 0;
     }
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 40389c4..58d597a 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -336,7 +336,8 @@ void QFxImage::paintContents(QPainter &p)
     if (d->pix.isNull())
         return;
 
-    QPainter::RenderHints oldHints = p.renderHints();
+    bool oldAA = p.testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = p.testRenderHint(QPainter::SmoothPixmapTransform);
     if (d->smooth)
         p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
 
@@ -428,8 +429,10 @@ void QFxImage::paintContents(QPainter &p)
                         QRect(pix.width()-sgr, pix.height() - sgb, sgr, sgb));
     }
 
-    if (d->smooth)
-        p.setRenderHints(oldHints);
+    if (d->smooth) {
+        p.setRenderHint(QPainter::Antialiasing, oldAA);
+        p.setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
+    }
 }
 #elif defined(QFX_RENDER_OPENGL)
 uint QFxImage::glSimpleItemData(float *vertices, float *texVertices,
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 0c4d97b..73786a8 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -897,7 +897,16 @@ void QFxItem::qmlLoaded()
         QmlContext *ctxt = new QmlContext(qmlContext(this));
         ctxt->addDefaultObject(this);
 
+        if (!d->_qmlcomp->errors().isEmpty()) {
+            qWarning() << d->_qmlcomp->errors();
+            delete d->_qmlcomp;
+            d->_qmlcomp = 0;
+            emit qmlChanged();
+            return;
+        }
         QObject *obj = d->_qmlcomp->create(ctxt);
+        if (!d->_qmlcomp->errors().isEmpty())
+            qWarning() << d->_qmlcomp->errors();
         QFxItem *qmlChild = qobject_cast<QFxItem *>(obj);
         if (qmlChild) {
             qmlChild->setItemParent(this);
diff --git a/src/declarative/fx/qfxpainteditem.cpp b/src/declarative/fx/qfxpainteditem.cpp
index 29d11ff..65589f2 100644
--- a/src/declarative/fx/qfxpainteditem.cpp
+++ b/src/declarative/fx/qfxpainteditem.cpp
@@ -156,7 +156,6 @@ void QFxPaintedItem::setSmooth(bool smooth)
     Q_D(QFxPaintedItem);
     if (d->smooth == smooth) return;
     d->smooth = smooth;
-    clearCache();
     update();
 }
 
@@ -304,7 +303,8 @@ void QFxPaintedItem::paintGLContents(GLPainter &p)
         for (int i = 0; i < rects.count(); ++i) {
             const QRect &r = rects.at(i);
             QPixmap img(r.size());
-            img.fill(Qt::transparent);
+            if (d->fillColor.isValid())
+                img.fill(d->fillColor);
             {
                 QPainter qp(&img);
                 qp.translate(-r.x(),-r.y());
@@ -384,4 +384,30 @@ void QFxPaintedItem::setCacheSize(int pixels)
     d->max_imagecache_size = pixels;
 }
 
+/*!
+    \property QFxPaintedItem::fillColor
+
+    The color to be used to fill the item prior to calling drawContents().
+    By default, this is Qt::transparent.
+
+    Performance improvements can be achieved if subclasses call this with either an
+    invalid color (QColor()), or an appropriate solid color.
+*/
+void QFxPaintedItem::setFillColor(const QColor& c)
+{
+    Q_D(QFxPaintedItem);
+    if (d->fillColor == c)
+        return;
+    d->fillColor = c;
+    emit fillColorChanged();
+    update();
+}
+
+QColor QFxPaintedItem::fillColor() const
+{
+    Q_D(const QFxPaintedItem);
+    return d->fillColor;
+}
+
+
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h
index b7db2d9..6cb8fe7 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -59,6 +59,7 @@ class Q_DECLARATIVE_EXPORT QFxPaintedItem : public QFxItem
 
     Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize)
     Q_PROPERTY(bool smooth READ isSmooth WRITE setSmooth)
+    Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
     Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
 
 public:
@@ -80,11 +81,17 @@ public:
     int cacheSize() const;
     void setCacheSize(int pixels);
 
+    QColor fillColor() const;
+    void setFillColor(const QColor&);
+
 protected:
     QFxPaintedItem(QFxPaintedItemPrivate &dd, QFxItem *parent);
 
     virtual void drawContents(QPainter *p, const QRect &) = 0;
 
+Q_SIGNALS:
+    void fillColorChanged();
+
 protected Q_SLOTS:
     void dirtyCache(const QRect &);
     void clearCache();
diff --git a/src/declarative/fx/qfxpainteditem_p.h b/src/declarative/fx/qfxpainteditem_p.h
index 21ac556..4e953a0 100644
--- a/src/declarative/fx/qfxpainteditem_p.h
+++ b/src/declarative/fx/qfxpainteditem_p.h
@@ -68,7 +68,7 @@ class QFxPaintedItemPrivate : public QFxItemPrivate
 
 public:
     QFxPaintedItemPrivate()
-      : max_imagecache_size(100000), smooth(false)
+      : max_imagecache_size(100000), smooth(false), fillColor(Qt::transparent)
     {
     }
 
@@ -89,6 +89,7 @@ public:
     int max_imagecache_size;
     bool smooth;
     QSize contentsSize;
+    QColor fillColor;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index adb33e8..f4a06ce 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -428,12 +428,6 @@ void QFxWebView::setInteractive(bool i)
     emit interactiveChanged();
 }
 
-void QFxWebView::updateCacheForVisibility()
-{
-    if (!isVisible())
-        clearCache();
-}
-
 void QFxWebView::expandToWebPage()
 {
     Q_D(QFxWebView);
@@ -845,7 +839,6 @@ void QFxWebView::setPage(QWebPage *page)
         d->idealheight>0 ? d->idealheight : -1));
     d->page->mainFrame()->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
     d->page->mainFrame()->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
-    connect(this,SIGNAL(visibleChanged()),this,SLOT(updateCacheForVisibility()));
     connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
     connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SIGNAL(urlChanged()));
     connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index c9a62cc..0ac1895 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -179,7 +179,6 @@ Q_SIGNALS:
     void doubleClick();
 
 private Q_SLOTS:
-    void updateCacheForVisibility();
     void expandToWebPage();
     void paintPage(const QRect&);
     void doLoadProgress(int p);