Support clicking to toggle checkboxes in QTextEdit

Add QAbstractTextDocumentLayout::markerAt(pos) for hit testing.
(Qt Quick TextEdit needs it too.) Finds out whether the position
corresponds to a marker on a paragraph.  I.e. it finds checkboxes in
GitHub-flavored markdown.  This enables editor classes to toggle
checkboxes by clicking them.

Use it in QTextEdit to add the checkbox toggling feature.  Also show the
"pointing finger" cursor when hovering a toggleable checkbox.

Change-Id: I036c967ab45e14c836272eac2cc7c7d652543c89
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
 
 
 
 
 
 

1 files changed, 31 insertions, 0 deletions

diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 2278378613..5263ece87c 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -41,6 +41,7 @@
 #include <qtextformat.h>
 #include "qtextdocument_p.h"
 #include "qtextengine_p.h"
+#include "qtextlist.h"
 
 #include "qabstracttextdocumentlayout_p.h"
 
@@ -650,6 +651,36 @@ QTextFormat QAbstractTextDocumentLayout::formatAt(const QPointF &pos) const
 }
 
 /*!
+    \since 5.14
+
+    Returns the block (probably a list item) whose \l{QTextBlockFormat::marker()}{marker}
+    is found at the given position \a pos.
+*/
+QTextBlock QAbstractTextDocumentLayout::blockWithMarkerAt(const QPointF &pos) const
+{
+    QTextBlock block = document()->firstBlock();
+    while (block.isValid()) {
+        if (block.blockFormat().marker() != QTextBlockFormat::NoMarker) {
+            QRectF blockBr = blockBoundingRect(block);
+            QTextBlockFormat blockFmt = block.blockFormat();
+            QFontMetrics fm(block.charFormat().font());
+            qreal totalIndent = blockFmt.indent() + blockFmt.leftMargin() + blockFmt.textIndent();
+            if (block.textList())
+                totalIndent += block.textList()->format().indent() * 40;
+            QRectF adjustedBr = blockBr.adjusted(totalIndent - fm.height(), 0, totalIndent - blockBr.width(), fm.height() - blockBr.height());
+            if (adjustedBr.contains(pos)) {
+                //qDebug() << "hit block" << block.text() << blockBr << adjustedBr << "marker" << block.blockFormat().marker()
+                //         << "font" << block.charFormat().font() << "adj" << lineHeight << totalIndent;
+                if (block.blockFormat().hasProperty(QTextFormat::BlockMarker))
+                    return block;
+            }
+        }
+        block = block.next();
+    }
+    return QTextBlock();
+}
+
+/*!
     \fn QRectF QAbstractTextDocumentLayout::frameBoundingRect(QTextFrame *frame) const
 
     Returns the bounding rectangle of \a frame.