MCL/sf/mw/qt: comparison src/gui/widgets/qplaintextedit.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 void QPlainTextDocumentLayout::layoutBlock(const QTextBlock &block)
 {
 Q_D(QPlainTextDocumentLayout);
 QTextDocument *doc = document();
 qreal margin = doc->documentMargin();
-QFontMetrics fm(doc->defaultFont());
 qreal blockMaximumWidth = 0;
-int leading = qMax(0, fm.leading());
 qreal height = 0;
 QTextLayout *tl = block.layout();
 QTextOption option = doc->defaultTextOption();
 tl->setTextOption(option);
 availableWidth -= 2*margin + extraMargin;
 while (1) {
 QTextLine line = tl->createLine();
 if (!line.isValid())
 break;
+line.setLeadingIncluded(true);
 line.setLineWidth(availableWidth);
-height += leading;
 line.setPosition(QPointF(margin, height));
 height += line.height();
 blockMaximumWidth = qMax(blockMaximumWidth, line.naturalTextWidth() + 2*margin);
 }
 tl->endLayout();
 if (center)
 height /= 2;
 qreal h = center ? line.naturalTextRect().center().y() : line.naturalTextRect().bottom();
+QTextBlock previousVisibleBlock = block;
 while (h < height && block.previous().isValid()) {
-block = block.previous();
+previousVisibleBlock = block;
+do {
+block = block.previous();
+} while (!block.isVisible() && block.previous().isValid());
 h += q->blockBoundingRect(block).height();
 }
 int l = 0;
 int lineCount = block.layout()->lineCount();
 if (h - voffset - lineRect.top() <= height)
 break;
 ++l;
 }
-if (block.next().isValid() && l >= lineCount) {
+if (l >= lineCount) {
-block = block.next();
+block = previousVisibleBlock;
 l = 0;
 }
 setTopBlock(block.blockNumber(), l);
 } else if (lr.top() < visible.top()) {
 setTopBlock(block.blockNumber(), line.lineNumber());
 {
 showCursorOnInitialShow = true;
 backgroundVisible = false;
 centerOnScroll = false;
 inDrag = false;
-#ifdef Q_WS_WIN
-singleFingerPanEnabled = true;
-#endif
 }
 void QPlainTextEditPrivate::init(const QString &txt)
 {
 QObject::connect(control, SIGNAL(copyAvailable(bool)), q, SIGNAL(copyAvailable(bool)));
 QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
 QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged()));
 QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
+QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus()));
 // set a null page size initially to avoid any relayouting until the textedit
 // is shown. relayoutDocument() will take care of setting the page size to the
 // viewport dimensions later.
 doc->setTextWidth(-1);
 #ifndef QT_NO_CURSOR
 viewport->setCursor(Qt::IBeamCursor);
 #endif
 originalOffsetY = 0;
+#ifdef Q_WS_WIN
+setSingleFingerPanEnabled(true);
+#endif
 }
 void QPlainTextEditPrivate::_q_repaintContents(const QRectF &contentsRect)
 {
 Q_Q(QPlainTextEdit);
 else if (e->type() == QEvent::EnterEditFocus || e->type() == QEvent::LeaveEditFocus) {
 if (QApplication::keypadNavigationEnabled())
 d->sendControlEvent(e);
 }
 #endif
+else if (e->type() == QEvent::Gesture) {
+QGestureEvent *ge = static_cast<QGestureEvent *>(e);
+QPanGesture *g = static_cast<QPanGesture *>(ge->gesture(Qt::PanGesture));
+if (g) {
+QScrollBar *hBar = horizontalScrollBar();
+QScrollBar *vBar = verticalScrollBar();
+if (g->state() == Qt::GestureStarted)
+d->originalOffsetY = vBar->value();
+QPointF offset = g->offset();
+if (!offset.isNull()) {
+if (QApplication::isRightToLeft())
+offset.rx() *= -1;
+// QPlainTextEdit scrolls by lines only in vertical direction
+QFontMetrics fm(document()->defaultFont());
+int lineHeight = fm.height();
+int newX = hBar->value() - g->delta().x();
+int newY = d->originalOffsetY - offset.y()/lineHeight;
+hBar->setValue(newX);
+vBar->setValue(newY);
+}
+}
+return true;
+}
 return QAbstractScrollArea::event(e);
 }
 /*! \internal
 */
 e->accept();
 d->pageUpDown(QTextCursor::Down, QTextCursor::MoveAnchor);
 return;
 }
 }
-#endif // QT_NO_SHORTCUT
 if (!(tif & Qt::TextEditable)) {
 switch (e->key()) {
 case Qt::Key_Space:
 e->accept();
 QAbstractScrollArea::keyPressEvent(e);
 }
 }
 return;
 }
+#endif // QT_NO_SHORTCUT
 d->sendControlEvent(e);
 #ifdef QT_KEYPAD_NAVIGATION
 if (!e->isAccepted()) {
 switch (e->key()) {
 bool editable = !isReadOnly();
 QTextBlock block = firstVisibleBlock();
 qreal maximumWidth = document()->documentLayout()->documentSize().width();
+// Set a brush origin so that the WaveUnderline knows where the wave started
+painter.setBrushOrigin(offset);
 // keep right margin clean from full-width selection
 int maxX = offset.x() + qMax((qreal)viewportRect.width(), maximumWidth)
 - document()->documentMargin();
 er.setRight(qMin(er.right(), maxX));
 painter.setClipRect(er);
 if (d->autoScrollTimer.isActive()) {
 d->autoScrollTimer.stop();
 d->ensureCursorVisible();
 }
-d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus);
+if (!isReadOnly() && rect().contains(e->pos()))
+d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus);
 d->clickCausedFocus = 0;
 }
 /*! \reimp
 */
 This signal is emitted whenever redo operations become available
 (\a available is true) or unavailable (\a available is false).
 */
-//void QPlainTextEditPrivate::_q_gestureTriggered()
-//{
-//    Q_Q(QPlainTextEdit);
-//    QPanGesture *g = qobject_cast<QPanGesture*>(q->sender());
-//    if (!g)
-//        return;
-//    QScrollBar *hBar = q->horizontalScrollBar();
-//    QScrollBar *vBar = q->verticalScrollBar();
-//    if (g->state() == Qt::GestureStarted)
-//        originalOffsetY = vBar->value();
-//    QSizeF totalOffset = g->totalOffset();
-//    if (!totalOffset.isNull()) {
-//        if (QApplication::isRightToLeft())
-//            totalOffset.rwidth() *= -1;
-//        // QPlainTextEdit scrolls by lines only in vertical direction
-//        QFontMetrics fm(q->document()->defaultFont());
-//        int lineHeight = fm.height();
-//        int newX = hBar->value() - g->lastOffset().width();
-//        int newY = originalOffsetY - totalOffset.height()/lineHeight;
-//        hbar->setValue(newX);
-//        vbar->setValue(newY);
-//    }
-//}
 QT_END_NAMESPACE
 #include "moc_qplaintextedit.cpp"
 #include "moc_qplaintextedit_p.cpp"

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7