Fix clicking on links in aligned or elided Text.

Adjust the mouse position to compensate for any alignment offsets
and test the elided text layout for anchors if none is found in
the normal layout.

Change-Id: Idfda3f7e372d0f2d6c1b7bb5f22d7015d52e8239
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

1 files changed, 33 insertions, 0 deletions

diff --git a/src/quick/items/qquicktextutil.cpp b/src/quick/items/qquicktextutil.cpp
index c2c11b3daa..176301d450 100644
--- a/src/quick/items/qquicktextutil.cpp
+++ b/src/quick/items/qquicktextutil.cpp
@@ -78,4 +78,37 @@ QQuickItem *QQuickTextUtil::createCursor(
     return item;
 }
 
+qreal QQuickTextUtil::alignedX(const QRectF &rect, qreal width, int alignment)
+{
+    qreal x = 0;
+    switch (alignment) {
+    case Qt::AlignLeft:
+    case Qt::AlignJustify:
+        break;
+    case Qt::AlignRight:
+        x = width - rect.width();
+        break;
+    case Qt::AlignHCenter:
+        x = (width - rect.width()) / 2;
+        break;
+    }
+    return x;
+}
+
+qreal QQuickTextUtil::alignedY(const QRectF &rect, const qreal height, int alignment)
+{
+    qreal y = 0;
+    switch (alignment) {
+    case Qt::AlignTop:
+        break;
+    case Qt::AlignBottom:
+        y = height - rect.height();
+        break;
+    case Qt::AlignVCenter:
+        y = (height - rect.height()) / 2;
+        break;
+    }
+    return y;
+}
+
 QT_END_NAMESPACE