D3D12: Painter node

Only supports QImage backing.

As a bonus add some notes to the Context2D docs too.

Change-Id: I18457a1f766d2f136c6864ec06fe596668d5e726
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

5 files changed, 193 insertions, 1 deletions

diff --git a/tests/manual/nodetypes/Painter.qml b/tests/manual/nodetypes/Painter.qml
new file mode 100644
index 0000000000..a5973379f4
--- /dev/null
+++ b/tests/manual/nodetypes/Painter.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import Stuff 1.0
+
+Item {
+    ListModel {
+        id: balloonModel
+        ListElement {
+            balloonWidth: 200
+        }
+        ListElement {
+            balloonWidth: 120
+        }
+        ListElement {
+            balloonWidth: 120
+        }
+        ListElement {
+            balloonWidth: 120
+        }
+        ListElement {
+            balloonWidth: 120
+        }
+    }
+
+    ListView {
+        anchors.fill: parent
+        anchors.margins: 10
+        id: balloonView
+        model: balloonModel
+        spacing: 5
+        delegate: TextBalloon {
+            anchors.right: index % 2 == 0 ? undefined : parent.right
+            height: 60
+            rightAligned: index % 2 == 0 ? false : true
+            width: balloonWidth
+            innerAnim: model.index === 1
+            NumberAnimation on width {
+                from: 200
+                to: 300
+                duration: 5000
+                running: model.index === 0
+            }
+        }
+    }
+}
diff --git a/tests/manual/nodetypes/main.qml b/tests/manual/nodetypes/main.qml
index 10f5840262..87d42da3bb 100644
--- a/tests/manual/nodetypes/main.qml
+++ b/tests/manual/nodetypes/main.qml
@@ -71,5 +71,8 @@ Item {
 
         if (event.key === Qt.Key_E)
             loader.source = "qrc:/Effects.qml";
+
+        if (event.key === Qt.Key_P)
+            loader.source = "qrc:/Painter.qml";
     }
 }
diff --git a/tests/manual/nodetypes/nodetypes.cpp b/tests/manual/nodetypes/nodetypes.cpp
index 3ebae43c00..ac54e069ed 100644
--- a/tests/manual/nodetypes/nodetypes.cpp
+++ b/tests/manual/nodetypes/nodetypes.cpp
@@ -43,6 +43,108 @@
 #include <QQuickView>
 #include <QQmlEngine>
 #include <QQmlContext>
+#include <QQuickPaintedItem>
+#include <QPainter>
+#include <QTimer>
+
+class TextBalloon : public QQuickPaintedItem
+{
+    Q_OBJECT
+    Q_PROPERTY(bool rightAligned READ isRightAligned WRITE setRightAligned NOTIFY rightAlignedChanged)
+    Q_PROPERTY(bool innerAnim READ innerAnimEnabled WRITE setInnerAnimEnabled NOTIFY innerAnimChanged)
+
+public:
+    TextBalloon(QQuickItem *parent = nullptr) : QQuickPaintedItem(parent) {
+        connect(&m_timer, &QTimer::timeout, this, &TextBalloon::onAnim);
+        m_timer.setInterval(500);
+    }
+    void paint(QPainter *painter);
+
+    bool isRightAligned() { return m_rightAligned; }
+    void setRightAligned(bool rightAligned);
+
+    bool innerAnimEnabled() const { return m_innerAnim; }
+    void setInnerAnimEnabled(bool b);
+
+signals:
+    void rightAlignedChanged();
+    void innerAnimChanged();
+
+private slots:
+    void onAnim();
+
+private:
+    bool m_rightAligned = false;
+    bool m_innerAnim = false;
+    QTimer m_timer;
+    QRect m_animRect = QRect(10, 10, 50, 20);
+    int m_anim = 0;
+};
+
+void TextBalloon::paint(QPainter *painter)
+{
+    QBrush brush(QColor("#007430"));
+
+    painter->setBrush(brush);
+    painter->setPen(Qt::NoPen);
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    painter->drawRoundedRect(0, 0, boundingRect().width(), boundingRect().height() - 10, 10, 10);
+
+    if (m_rightAligned) {
+        const QPointF points[3] = {
+            QPointF(boundingRect().width() - 10.0, boundingRect().height() - 10.0),
+            QPointF(boundingRect().width() - 20.0, boundingRect().height()),
+            QPointF(boundingRect().width() - 30.0, boundingRect().height() - 10.0),
+        };
+        painter->drawConvexPolygon(points, 3);
+    } else {
+        const QPointF points[3] = {
+            QPointF(10.0, boundingRect().height() - 10.0),
+            QPointF(20.0, boundingRect().height()),
+            QPointF(30.0, boundingRect().height() - 10.0),
+        };
+        painter->drawConvexPolygon(points, 3);
+    }
+
+    if (m_innerAnim) {
+        painter->fillRect(m_animRect, Qt::lightGray);
+        const int x = m_animRect.x() + m_anim;
+        const int y = m_animRect.y() + m_animRect.height() / 2;
+        painter->setPen(QPen(QBrush(Qt::SolidLine), 4));
+        painter->drawLine(x + 4, y, x + 10, y);
+        m_anim += 10;
+        if (m_anim > m_animRect.width())
+            m_anim = 0;
+    }
+}
+
+void TextBalloon::setRightAligned(bool rightAligned)
+{
+    if (m_rightAligned == rightAligned)
+        return;
+
+    m_rightAligned = rightAligned;
+    emit rightAlignedChanged();
+}
+
+void TextBalloon::setInnerAnimEnabled(bool b)
+{
+    if (m_innerAnim == b)
+        return;
+
+    m_innerAnim = b;
+    if (!b)
+        m_timer.stop();
+    else
+        m_timer.start();
+    emit innerAnimChanged();
+}
+
+void TextBalloon::onAnim()
+{
+    update(m_animRect);
+}
 
 class Helper : public QObject
 {
@@ -68,6 +170,7 @@ int main(int argc, char **argv)
     qDebug("  [A] - Render thread Animator");
     qDebug("  [L] - Layers");
     qDebug("  [E] - Effects");
+    qDebug("  [P] - QQuickPaintedItem");
     qDebug("\nPress S to stop the currently running test\n");
 
     Helper helper;
@@ -79,6 +182,7 @@ int main(int argc, char **argv)
         view.setFormat(fmt);
     }
     view.engine()->rootContext()->setContextProperty(QLatin1String("helper"), &helper);
+    qmlRegisterType<TextBalloon>("Stuff", 1, 0, "TextBalloon");
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.resize(1024, 768);
     view.setSource(QUrl("qrc:/main.qml"));
diff --git a/tests/manual/nodetypes/nodetypes.pro b/tests/manual/nodetypes/nodetypes.pro
index 43b79323a8..afb5a46a84 100644
--- a/tests/manual/nodetypes/nodetypes.pro
+++ b/tests/manual/nodetypes/nodetypes.pro
@@ -5,5 +5,5 @@ SOURCES += nodetypes.cpp
 RESOURCES += nodetypes.qrc
 
 OTHER_FILES += main.qml Rects.qml LotsOfRects.qml \
-               Images.qml Text.qml Animators.qml Layers.qml Effects.qml \
+               Images.qml Text.qml Animators.qml Layers.qml Effects.qml Painter.qml \
                wobble.hlsl shadow1.hlsl shadow2.hlsl
diff --git a/tests/manual/nodetypes/nodetypes.qrc b/tests/manual/nodetypes/nodetypes.qrc
index 64bd503319..56fa2b6ee4 100644
--- a/tests/manual/nodetypes/nodetypes.qrc
+++ b/tests/manual/nodetypes/nodetypes.qrc
@@ -8,6 +8,7 @@
         <file>Animators.qml</file>
         <file>Layers.qml</file>
         <file>Effects.qml</file>
+        <file>Painter.qml</file>
         <file>qt.png</file>
         <file>face-smile.png</file>
         <file>shadow.png</file>