diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-01-22 14:21:46 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 01:20:38 +0100 |
commit | a697d20f822739546baed5b4853da008b86462bd (patch) | |
tree | 78a3020b24e58d8c916d40298422177b5bf89370 /src/quick/items | |
parent | 1f23802e46d0141fbc3b7a2d2c1025b6b7d903ae (diff) |
Expose Text::linkAt(x, y)
[ChangeLog][QtQuick] Added Text::linkAt(x,y) method.
Task-number: QTBUG-18946
Change-Id: I3b4071c6117ac0ee636f2fdbd2c392eb05b02dd7
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktext.cpp | 19 | ||||
-rw-r--r-- | src/quick/items/qquicktext_p.h | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 96746223ce..4652bdf98e 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -269,6 +269,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickText, 2>(uri, 2, 2, "Text"); qmlRegisterType<QQuickTextEdit, 2>(uri, 2, 2, "TextEdit"); + + qmlRegisterType<QQuickText, 3>(uri, 2, 3, "Text"); } static void initResources() diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 03454e2bf9..ae14a43de0 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2569,7 +2569,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected() text. The link must be in rich text or HTML format and the \a link string provides access to the particular link. - \sa hoveredLink + \sa hoveredLink, linkAt() */ /*! @@ -2580,7 +2580,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected() embedded in the text. The link must be in rich text or HTML format and the \a hoveredLink string provides access to the particular link. - \sa onLinkHovered + \sa onLinkHovered, linkAt() */ QString QQuickText::hoveredLink() const @@ -2680,4 +2680,19 @@ void QQuickText::doLayout() d->updateSize(); } +/*! + \qmlmethod QtQuick::Text::linkAt(real x, real y) + \since 5.3 + + Returns the link string at point \a x, \a y in content coordinates, + or an empty string if no link exists at that point. + + \sa hoveredLink +*/ +QString QQuickText::linkAt(qreal x, qreal y) const +{ + Q_D(const QQuickText); + return d->anchorAt(QPointF(x, y)); +} + QT_END_NAMESPACE diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index d55dc7e287..44bd5aa9b0 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -210,6 +210,8 @@ public: QString hoveredLink() const; + Q_REVISION(3) Q_INVOKABLE QString linkAt(qreal x, qreal y) const; + Q_SIGNALS: void textChanged(const QString &text); void linkActivated(const QString &link); |