experiment with a different way of doing parenthesis matching. This is not finished and

work in progress.

src/plugins/texteditor/basetexteditor.cpp

@@ -192,6 +192,7 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
     d->m_highlightBlocksTimer->setSingleShot(true);
     connect(d->m_highlightBlocksTimer, SIGNAL(timeout()), this, SLOT(_q_highlightBlocks()));
 
+    d->m_animator = 0;
 
     d->m_searchResultFormat.setBackground(QColor(0xffef0b));
 
@@ -2134,6 +2135,12 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
         }
     }
 
+    if (d->m_animator) {
+        QTextCursor cursor = textCursor();
+        cursor.setPosition(d->m_animator->position());
+        d->m_animator->draw(&painter, cursorRect(cursor).topLeft());
+    }
+
 
     if (d->m_visibleWrapColumn > 0) {
         qreal lineX = fontMetrics().width('x') * d->m_visibleWrapColumn + offset.x() + 4;
@@ -2379,8 +2386,9 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
         if (d->m_lineNumbersVisible) {
             const QString &number = QString::number(blockNumber + 1);
             bool selected = (
-                    selStart < block.position() + block.length()
+                    (selStart < block.position() + block.length()
-                    && selEnd > block.position()
+                    && selEnd > block.position())
+                    || (selStart == selEnd && selStart == block.position())
                     );
             if (selected) {
                 painter.save();
@@ -3369,11 +3377,78 @@ void BaseTextEditor::setFindScope(const QTextCursor &scope)
     }
 }
 
+void BaseTextEditor::_q_animateUpdate(int position, QRectF rect)
+{
+    QTextCursor cursor(textCursor());
+    cursor.setPosition(position);
+    viewport()->update(QRectF(cursorRect(cursor).topLeft() + rect.topLeft(), rect.size()).toAlignedRect());
+}
+
+
+BaseTextEditorAnimator::BaseTextEditorAnimator(QObject *parent)
+        :QObject(parent)
+{
+    m_value = 0;
+    m_timeline = new QTimeLine(500, this);
+    m_timeline->setCurveShape(QTimeLine::SineCurve);
+    connect(m_timeline, SIGNAL(valueChanged(qreal)), this, SLOT(step(qreal)));
+    connect(m_timeline, SIGNAL(finished()), this, SLOT(deleteLater()));
+    m_timeline->start();
+}
+
+
+void BaseTextEditorAnimator::setData(QFont f, QPalette pal, const QString &text)
+{
+        m_font = f;
+        m_palette = pal;
+        m_text = text;
+        QFontMetrics fm(m_font);
+        m_size = QSizeF(fm.width(m_text), fm.height());
+    }
+
+void BaseTextEditorAnimator::draw(QPainter *p, const QPointF &pos)
+{
+    p->setPen(m_palette.text().color());
+    QFont f = m_font;
+    f.setPointSizeF(f.pointSizeF() * (1.0 + m_value));
+    QFontMetrics fm(f);
+    int width = fm.width(m_text);
+    QRectF r((m_size.width()-width)/2, (m_size.height() - fm.height())/2, width, fm.height());
+    r.translate(pos);
+    p->fillRect(r, m_palette.base());
+    p->setFont(f);
+    p->drawText(r, m_text);
+}
+
+QRectF BaseTextEditorAnimator::rect() const
+{
+    QFont f = m_font;
+    f.setPointSizeF(f.pointSizeF() * (1.0 + m_value));
+    QFontMetrics fm(f);
+    int width = fm.width(m_text);
+    return QRectF((m_size.width()-width)/2, (m_size.height() - fm.height())/2, width, fm.height());
+}
+
+void BaseTextEditorAnimator::step(qreal v)
+{
+    QRectF before = rect();
+    m_value = v;
+    QRectF after = rect();
+    emit updateRequest(m_position, before.united(after));
+}
+
+void BaseTextEditorAnimator::finish()
+{
+    step(0);
+    deleteLater();
+}
+
 void BaseTextEditor::_q_matchParentheses()
 {
     if (isReadOnly())
         return;
 
+
     QTextCursor backwardMatch = textCursor();
     QTextCursor forwardMatch = textCursor();
     const TextBlockUserData::MatchType backwardMatchType = TextBlockUserData::matchCursorBackward(&backwardMatch);
@@ -3386,6 +3461,7 @@ void BaseTextEditor::_q_matchParentheses()
         return;
     }
 
+    int animatePosition = -1;
     if (backwardMatch.hasSelection()) {
         QTextEdit::ExtraSelection sel;
         if (backwardMatchType == TextBlockUserData::Mismatch) {
@@ -3393,11 +3469,12 @@ void BaseTextEditor::_q_matchParentheses()
             sel.format = d->m_mismatchFormat;
         } else {
 
-            if (d->m_formatRange) {
+//            if (d->m_formatRange) {
-                sel.cursor = backwardMatch;
+//                sel.cursor = backwardMatch;
-                sel.format = d->m_rangeFormat;
+//                sel.format = d->m_rangeFormat;
-                extraSelections.append(sel);
+//                extraSelections.append(sel);
-            }
+//            }
+            animatePosition = backwardMatch.selectionStart();
 
             sel.cursor = backwardMatch;
             sel.format = d->m_matchFormat;
@@ -3419,11 +3496,13 @@ void BaseTextEditor::_q_matchParentheses()
             sel.format = d->m_mismatchFormat;
         } else {
 
-            if (d->m_formatRange) {
+            animatePosition = forwardMatch.selectionEnd()-1;
-                sel.cursor = forwardMatch;
+
-                sel.format = d->m_rangeFormat;
+//            if (d->m_formatRange) {
-                extraSelections.append(sel);
+//                sel.cursor = forwardMatch;
-            }
+//                sel.format = d->m_rangeFormat;
+//                extraSelections.append(sel);
+//            }
 
             sel.cursor = forwardMatch;
             sel.format = d->m_matchFormat;
@@ -3438,6 +3517,22 @@ void BaseTextEditor::_q_matchParentheses()
         extraSelections.append(sel);
     }
     setExtraSelections(ParenthesesMatchingSelection, extraSelections);
+
+
+    if (animatePosition >= 0) {
+        if (d->m_animator)
+            d->m_animator->finish();  // one animation is enough
+        d->m_animator = new BaseTextEditorAnimator(this);
+        d->m_animator->setPosition(animatePosition);
+        QPalette pal;
+        pal.setBrush(QPalette::Text, d->m_matchFormat.foreground());
+        pal.setBrush(QPalette::Base, d->m_rangeFormat.background());
+        d->m_animator->setData(font(), pal, characterAt(d->m_animator->position()));
+        connect(d->m_animator, SIGNAL(updateRequest(int,QRectF)),
+                this, SLOT(_q_animateUpdate(int,QRectF)));
+    }
+
+
 }
 
 void BaseTextEditor::_q_highlightBlocks()

src/plugins/texteditor/basetexteditor.h

@@ -37,6 +37,7 @@
 #include <QtGui/QPlainTextEdit>
 #include <QtGui/QLabel>
 #include <QtGui/QKeyEvent>
+#include <QtCore/QTimeLine>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
@@ -219,6 +220,43 @@ public:
 
 class BaseTextEditorEditable;
 
+class TEXTEDITOR_EXPORT BaseTextEditorAnimator : public QObject
+{
+    Q_OBJECT
+
+public:
+    BaseTextEditorAnimator(QObject *parent);
+
+    void setPosition(int position) { m_position = position; }
+    int position() const { return m_position; }
+
+    void setData(QFont f, QPalette pal, const QString &text);
+
+    void draw(QPainter *p, const QPointF &pos);
+    QRectF rect() const;
+
+    qreal value() const { return m_value; }
+
+    void finish();
+
+signals:
+    void updateRequest(int position, QRectF rect);
+
+
+private slots:
+    void step(qreal v);
+
+private:
+    QTimeLine *m_timeline;
+    qreal m_value;
+    int m_position;
+    QFont m_font;
+    QPalette m_palette;
+    QString m_text;
+    QSizeF m_size;
+};
+
+
 class TEXTEDITOR_EXPORT BaseTextEditor
   : public QPlainTextEdit
 {
@@ -468,6 +506,7 @@ private slots:
     void _q_matchParentheses();
     void _q_highlightBlocks();
     void slotSelectionChanged();
+    void _q_animateUpdate(int position, QRectF rect);
 };
 
 

src/plugins/texteditor/basetexteditor_p.h

@@ -34,6 +34,7 @@
 
 #include <QtCore/QBasicTimer>
 #include <QtCore/QSharedData>
+#include <QtCore/QPointer>
 
 #include <QtGui/QTextEdit>
 #include <QtGui/QPixmap>
@@ -126,6 +127,7 @@ struct BaseTextEditorPrivateHighlightBlocks
     inline bool operator!=(const BaseTextEditorPrivateHighlightBlocks &o) const { return !(*this == o); }
 };
 
+
 class BaseTextEditorPrivate
 {
     BaseTextEditorPrivate(const BaseTextEditorPrivate &);
@@ -236,6 +238,8 @@ public:
     BaseTextEditorPrivateHighlightBlocks m_highlightBlocksInfo;
     QTimer *m_highlightBlocksTimer;
 
+    QPointer<BaseTextEditorAnimator> m_animator;
+
 };
 
 } // namespace Internal