Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ifb69f73ac805afe5e3c8708fa975b7d3c13a4e48

1 files changed, 197 insertions, 0 deletions

diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index d7765cdc69..f5cc19c877 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -39,6 +39,10 @@
 
 #include "qquickshadereffectmesh_p.h"
 #include <QtQuick/qsggeometry.h>
+#include "qquickshadereffect_p.h"
+#include "qquickscalegrid_p_p.h"
+#include "qquickborderimage_p_p.h"
+#include <QtQuick/private/qsgbasicimagenode_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -239,4 +243,197 @@ QSize QQuickGridMesh::resolution() const
     return m_resolution;
 }
 
+/*!
+    \qmltype BorderImageMesh
+    \instantiates QQuickBorderImageMesh
+    \inqmlmodule QtQuick
+    \since 5.8
+    \ingroup qtquick-effects
+    \brief Defines a mesh with vertices arranged like those of a BorderImage.
+
+    BorderImageMesh provides BorderImage-like capabilities to a ShaderEffect
+    without the need for a potentially costly ShaderEffectSource.
+
+    The following are functionally equivalent:
+    \qml
+    BorderImage {
+        id: borderImage
+        border {
+            left: 10
+            right: 10
+            top: 10
+            bottom: 10
+        }
+        source: "myImage.png"
+        visible: false
+    }
+    ShaderEffectSource {
+        id: effectSource
+        sourceItem: borderImage
+        visible: false
+    }
+    ShaderEffect {
+        property var source: effectSource
+        ...
+    }
+    \endqml
+
+    \qml
+    Image {
+        id: image
+        source: "myImage.png"
+        visible: false
+    }
+    ShaderEffect {
+        property var source: image
+        mesh: BorderImageMesh {
+            border {
+                left: 10
+                right: 10
+                top: 10
+                bottom: 10
+            }
+            size: image.sourceSize
+        }
+        ...
+    }
+    \endqml
+
+    But the BorderImageMesh version can typically be better optimized.
+*/
+QQuickBorderImageMesh::QQuickBorderImageMesh(QObject *parent)
+    : QQuickShaderEffectMesh(parent), m_border(new QQuickScaleGrid(this)),
+      m_horizontalTileMode(QQuickBorderImageMesh::Stretch),
+      m_verticalTileMode(QQuickBorderImageMesh::Stretch)
+{
+}
+
+bool QQuickBorderImageMesh::validateAttributes(const QVector<QByteArray> &attributes, int *posIndex)
+{
+    Q_UNUSED(attributes);
+    Q_UNUSED(posIndex);
+    return true;
+}
+
+QSGGeometry *QQuickBorderImageMesh::updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex,
+                                                   const QRectF &srcRect, const QRectF &rect)
+{
+    Q_UNUSED(attrCount);
+    Q_UNUSED(posIndex);
+
+    QRectF innerSourceRect;
+    QRectF targetRect;
+    QRectF innerTargetRect;
+    QRectF subSourceRect;
+
+    QQuickBorderImagePrivate::calculateRects(m_border, m_size, rect.size(), m_horizontalTileMode, m_verticalTileMode,
+                                             1, &targetRect, &innerTargetRect, &innerSourceRect, &subSourceRect);
+
+    QRectF sourceRect = srcRect;
+    QRectF modifiedInnerSourceRect(sourceRect.x() + innerSourceRect.x() * sourceRect.width(),
+                                   sourceRect.y() + innerSourceRect.y() * sourceRect.height(),
+                                   innerSourceRect.width() * sourceRect.width(),
+                                   innerSourceRect.height() * sourceRect.height());
+
+    geometry = QSGBasicImageNode::updateGeometry(targetRect, innerTargetRect, sourceRect,
+                                                 modifiedInnerSourceRect, subSourceRect, geometry);
+
+    return geometry;
+}
+
+/*!
+    \qmlpropertygroup QtQuick::BorderImageMesh::border
+    \qmlproperty int QtQuick::BorderImageMesh::border.left
+    \qmlproperty int QtQuick::BorderImageMesh::border.right
+    \qmlproperty int QtQuick::BorderImageMesh::border.top
+    \qmlproperty int QtQuick::BorderImageMesh::border.bottom
+
+    The 4 border lines (2 horizontal and 2 vertical) break the image into 9 sections,
+    as shown below:
+
+    \image declarative-scalegrid.png
+
+    Each border line (left, right, top, and bottom) specifies an offset in pixels
+    from the respective edge of the mesh. By default, each border line has
+    a value of 0.
+
+    For example, the following definition sets the bottom line 10 pixels up from
+    the bottom of the mesh:
+
+    \qml
+    BorderImageMesh {
+        border.bottom: 10
+        // ...
+    }
+    \endqml
+*/
+QQuickScaleGrid *QQuickBorderImageMesh::border()
+{
+    return m_border;
+}
+
+/*!
+    \qmlproperty size QtQuick::BorderImageMesh::size
+
+    The base size of the mesh. This generally corresponds to the \l {Image::}{sourceSize}
+    of the image being used by the ShaderEffect.
+*/
+QSize QQuickBorderImageMesh::size() const
+{
+    return m_size;
+}
+
+void QQuickBorderImageMesh::setSize(const QSize &size)
+{
+    if (size == m_size)
+        return;
+    m_size = size;
+    Q_EMIT sizeChanged();
+    Q_EMIT geometryChanged();
+}
+
+/*!
+    \qmlproperty enumeration QtQuick::BorderImageMesh::horizontalTileMode
+    \qmlproperty enumeration QtQuick::BorderImageMesh::verticalTileMode
+
+    This property describes how to repeat or stretch the middle parts of an image.
+
+    \list
+    \li BorderImage.Stretch - Scales the image to fit to the available area.
+    \li BorderImage.Repeat - Tile the image until there is no more space. May crop the last image.
+    \li BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
+    \endlist
+
+    The default tile mode for each property is BorderImage.Stretch.
+*/
+
+QQuickBorderImageMesh::TileMode QQuickBorderImageMesh::horizontalTileMode() const
+{
+    return m_horizontalTileMode;
+}
+
+void QQuickBorderImageMesh::setHorizontalTileMode(TileMode t)
+{
+    if (t == m_horizontalTileMode)
+        return;
+    m_horizontalTileMode = t;
+    Q_EMIT horizontalTileModeChanged();
+    Q_EMIT geometryChanged();
+}
+
+QQuickBorderImageMesh::TileMode QQuickBorderImageMesh::verticalTileMode() const
+{
+    return m_verticalTileMode;
+}
+
+void QQuickBorderImageMesh::setVerticalTileMode(TileMode t)
+{
+    if (t == m_verticalTileMode)
+        return;
+
+    m_verticalTileMode = t;
+    Q_EMIT verticalTileModeChanged();
+    Q_EMIT geometryChanged();
+}
+
 QT_END_NAMESPACE