From 1d1e67f08bbcba973f1582871b87fb35d41c4eaa Mon Sep 17 00:00:00 2001 From: J-P Nurmi <jpnurmi@digia.com> Date: Mon, 17 Jun 2013 16:02:33 +0200 Subject: [PATCH] TextArea: switch to Qt.PointingHandCursor when hovering links Change-Id: I7c306093c1afc9f5dfe942cd29da427c6a57d869 Reviewed-by: Caroline Chao <caroline.chao@digia.com> --- examples/quick/controls/gallery/content/Controls.qml | 1 + examples/quick/controls/gallery/main.qml | 2 +- src/controls/TextArea.qml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml index c1403da58..3bf8191c6 100644 --- a/examples/quick/controls/gallery/content/Controls.qml +++ b/examples/quick/controls/gallery/content/Controls.qml @@ -175,6 +175,7 @@ Item { id: area frameVisible: frameCheckbox.checked text: loremIpsum + loremIpsum + textFormat: Qt.RichText wrapMode: wrapCheck.checked ? TextEdit.WordWrap : TextEdit.NoWrap width: contentRow.width - firstColumn.width - contentRow.spacing height: parent.height - group1.height - group2.height - 2 * parent.spacing diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml index 8ea3cf9e8..1f563c097 100644 --- a/examples/quick/controls/gallery/main.qml +++ b/examples/quick/controls/gallery/main.qml @@ -57,7 +57,7 @@ ApplicationWindow { minimumWidth: 570 property string loremIpsum: - "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+ + "<a href='lipsum.com'>Lorem ipsum</a> dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+ "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+ "incididunt ut labore et dolore magna aliqua.\n Ut enim ad minim veniam, quis nostrud "+ "exercitation ullamco laboris nisi ut aliquip ex ea commodo cosnsequat. "; diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index c1bb9bcb8..ce5764c60 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -741,7 +741,7 @@ ScrollView { MouseArea { parent: area.viewport anchors.fill: parent - cursorShape: Qt.IBeamCursor + cursorShape: edit.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor acceptedButtons: Qt.NoButton } } -- GitLab