1 files changed, 60 insertions, 2 deletions

diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index f86a747b0f..cad3a64749 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -494,6 +494,11 @@ void QWidgetTextControlPrivate::setContent(Qt::TextFormat format, const QString
             formatCursor.select(QTextCursor::Document);
             formatCursor.setCharFormat(charFormatForInsertion);
             formatCursor.endEditBlock();
+#if QT_CONFIG(textmarkdownreader)
+        } else if (format == Qt::MarkdownText) {
+            doc->setMarkdown(text);
+            doc->setUndoRedoEnabled(false);
+#endif
         } else {
 #ifndef QT_NO_TEXTHTMLPARSER
             doc->setHtml(text);
@@ -1197,6 +1202,14 @@ void QWidgetTextControl::setPlainText(const QString &text)
     d->setContent(Qt::PlainText, text);
 }
 
+#if QT_CONFIG(textmarkdownreader)
+void QWidgetTextControl::setMarkdown(const QString &text)
+{
+    Q_D(QWidgetTextControl);
+    d->setContent(Qt::MarkdownText, text);
+}
+#endif
+
 void QWidgetTextControl::setHtml(const QString &text)
 {
     Q_D(QWidgetTextControl);
@@ -1571,6 +1584,11 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto
             e->ignore();
             return;
     }
+    bool wasValid = blockWithMarkerUnderMouse.isValid();
+    blockWithMarkerUnderMouse = q->blockWithMarkerAt(pos);
+    if (wasValid != blockWithMarkerUnderMouse.isValid())
+        emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
+
 
     cursorIsFocusIndicator = false;
     const QTextCursor oldSelection = cursor;
@@ -1589,6 +1607,8 @@ void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton butto
         selectedBlockOnTrippleClick = cursor;
 
         anchorOnMousePress = QString();
+        blockWithMarkerUnderMouse = QTextBlock();
+        emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
 
         trippleClickTimer.stop();
     } else {
@@ -1728,6 +1748,11 @@ void QWidgetTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button
         }
         selectionChanged(true);
         repaintOldAndNewSelection(oldSelection);
+    } else {
+        bool wasValid = blockWithMarkerUnderMouse.isValid();
+        blockWithMarkerUnderMouse = q->blockWithMarkerAt(mousePos);
+        if (wasValid != blockWithMarkerUnderMouse.isValid())
+            emit q->blockMarkerHovered(blockWithMarkerUnderMouse);
     }
 
     sendMouseEventToInputContext(e, QEvent::MouseMove, button, mousePos, modifiers, buttons, globalPos);
@@ -1777,6 +1802,26 @@ void QWidgetTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton but
         emit q->microFocusChanged();
     }
 
+    // toggle any checkbox that the user clicks
+    if ((interactionFlags & Qt::TextEditable) && (button & Qt::LeftButton) &&
+            (blockWithMarkerUnderMouse.isValid()) && !cursor.hasSelection()) {
+        QTextBlock markerBlock = q->blockWithMarkerAt(pos);
+        if (markerBlock == blockWithMarkerUnderMouse) {
+            auto fmt = blockWithMarkerUnderMouse.blockFormat();
+            switch (fmt.marker()) {
+            case QTextBlockFormat::Unchecked :
+                fmt.setMarker(QTextBlockFormat::Checked);
+                break;
+            case QTextBlockFormat::Checked:
+                fmt.setMarker(QTextBlockFormat::Unchecked);
+                break;
+            default:
+                break;
+            }
+            cursor.setBlockFormat(fmt);
+        }
+    }
+
     if (interactionFlags & Qt::LinksAccessibleByMouse) {
         if (!(button & Qt::LeftButton))
             return;
@@ -2375,6 +2420,12 @@ QString QWidgetTextControl::anchorAtCursor() const
     return d->anchorForCursor(d->cursor);
 }
 
+QTextBlock QWidgetTextControl::blockWithMarkerAt(const QPointF &pos) const
+{
+    Q_D(const QWidgetTextControl);
+    return d->doc->documentLayout()->blockWithMarkerAt(pos);
+}
+
 bool QWidgetTextControl::overwriteMode() const
 {
     Q_D(const QWidgetTextControl);
@@ -2431,7 +2482,7 @@ void QWidgetTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelectio
     QHash<int, int> hash;
     for (int i = 0; i < d->extraSelections.count(); ++i) {
         const QAbstractTextDocumentLayout::Selection &esel = d->extraSelections.at(i);
-        hash.insertMulti(esel.cursor.anchor(), i);
+        hash.insert(esel.cursor.anchor(), i);
     }
 
     for (int i = 0; i < selections.count(); ++i) {
@@ -3124,6 +3175,13 @@ QString QWidgetTextControl::toHtml() const
 }
 #endif
 
+#ifndef QT_NO_TEXTHTMLPARSER
+QString QWidgetTextControl::toMarkdown(QTextDocument::MarkdownFeatures features) const
+{
+    return document()->toMarkdown(features);
+}
+#endif
+
 void QWidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format)
 {
     QTextCursor tmp(doc);