dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

VTextEdit: bug fix

Browse Source
This commit is contained in:
Le Tan 2018-09-18 19:27:33 +08:00
parent 14ab49165e
commit f9820cf709
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/vtextdocumentlayout.cpp
View File

@ -84,7 +84,7 @@ void VTextDocumentLayout::blockRangeFromRect(const QRectF &p_rect,
QTextBlock block = document()->firstBlock(); QTextBlock block = document()->firstBlock();
while (block.isValid()) { while (block.isValid()) {
const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block); const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block);
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
if (info->top() == y if (info->top() == y
|| (info->top() < y && info->bottom() >= y)) { || (info->top() < y && info->bottom() >= y)) {
@ -103,7 +103,7 @@ void VTextDocumentLayout::blockRangeFromRect(const QRectF &p_rect,
y += p_rect.height(); y += p_rect.height();
while (block.isValid()) { while (block.isValid()) {
const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block); const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block);
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
if (info->bottom() > y) { if (info->bottom() > y) {
p_last = block.blockNumber(); p_last = block.blockNumber();
@ -140,7 +140,7 @@ void VTextDocumentLayout::blockRangeFromRectBS(const QRectF &p_rect,
p_last = document()->blockCount() - 1; p_last = document()->blockCount() - 1;
while (block.isValid()) { while (block.isValid()) {
const BlockLayoutInfo *tinfo = VTextBlockData::layoutInfo(block); const BlockLayoutInfo *tinfo = VTextBlockData::layoutInfo(block);
Q_ASSERT(tinfo->hasOffset()); V_ASSERT(tinfo->hasOffset());
if (tinfo->bottom() > y) { if (tinfo->bottom() > y) {
p_last = block.blockNumber(); p_last = block.blockNumber();
@ -164,7 +164,7 @@ int VTextDocumentLayout::findBlockByPosition(const QPointF &p_point) const
return -1; return -1;
} }
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
if (info->top() <= y && info->bottom() > y) { if (info->top() <= y && info->bottom() > y) {
// Found it. // Found it.
return mid; return mid;
@ -203,7 +203,7 @@ void VTextDocumentLayout::draw(QPainter *p_painter, const PaintContext &p_contex
while (block.isValid()) { while (block.isValid()) {
const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block); const BlockLayoutInfo *info = VTextBlockData::layoutInfo(block);
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
const QRectF &rect = info->m_rect; const QRectF &rect = info->m_rect;
QTextLayout *layout = block.layout(); QTextLayout *layout = block.layout();
@ -339,7 +339,7 @@ QVector<QTextLayout::FormatRange> VTextDocumentLayout::formatRangeFromSelection(
// a position to specify the line. that's more convenience in usage. // a position to specify the line. that's more convenience in usage.
QTextLayout::FormatRange o; QTextLayout::FormatRange o;
QTextLine l = p_block.layout()->lineForTextPosition(range.cursor.position() - blpos); QTextLine l = p_block.layout()->lineForTextPosition(range.cursor.position() - blpos);
Q_ASSERT(l.isValid()); V_ASSERT(l.isValid());
o.start = l.textStart(); o.start = l.textStart();
o.length = l.textLength(); o.length = l.textLength();
if (o.start + o.length == bllen - 1) { if (o.start + o.length == bllen - 1) {
@ -363,7 +363,7 @@ int VTextDocumentLayout::hitTest(const QPointF &p_point, Qt::HitTestAccuracy p_a
} }
QTextBlock block = document()->findBlockByNumber(bn); QTextBlock block = document()->findBlockByNumber(bn);
Q_ASSERT(block.isValid()); V_ASSERT(block.isValid());
QTextLayout *layout = block.layout(); QTextLayout *layout = block.layout();
int off = 0; int off = 0;
QPointF pos = p_point - QPointF(m_margin, VTextBlockData::layoutInfo(block)->top()); QPointF pos = p_point - QPointF(m_margin, VTextBlockData::layoutInfo(block)->top());
@ -494,7 +494,7 @@ void VTextDocumentLayout::clearBlockLayout(QTextBlock &p_block)
void VTextDocumentLayout::layoutBlock(const QTextBlock &p_block) void VTextDocumentLayout::layoutBlock(const QTextBlock &p_block)
{ {
QTextDocument *doc = document(); QTextDocument *doc = document();
Q_ASSERT(m_margin == doc->documentMargin()); V_ASSERT(m_margin == doc->documentMargin());
QTextLayout *tl = p_block.layout(); QTextLayout *tl = p_block.layout();
QTextOption option = doc->defaultTextOption(); QTextOption option = doc->defaultTextOption();
@ -529,9 +529,10 @@ void VTextDocumentLayout::layoutBlock(const QTextBlock &p_block)
void VTextDocumentLayout::updateOffsetBefore(const QTextBlock &p_block) void VTextDocumentLayout::updateOffsetBefore(const QTextBlock &p_block)
{ {
BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block); BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block);
Q_ASSERT(!info->isNull()); V_ASSERT(!info->isNull());
if (p_block.blockNumber() == 0) { const int blockNum = p_block.blockNumber();
if (blockNum == 0) {
info->m_offset = 0; info->m_offset = 0;
} else { } else {
QTextBlock blk = p_block.previous(); QTextBlock blk = p_block.previous();
@ -554,26 +555,25 @@ void VTextDocumentLayout::updateOffsetBefore(const QTextBlock &p_block)
// Now we reach a block with offset. // Now we reach a block with offset.
qreal offset = pinfo->bottom(); qreal offset = pinfo->bottom();
blk = blk.next(); blk = blk.next();
while (blk.isValid()) { while (blk.isValid() && blk.blockNumber() <= blockNum) {
BlockLayoutInfo *ninfo = VTextBlockData::layoutInfo(blk); BlockLayoutInfo *ninfo = VTextBlockData::layoutInfo(blk);
Q_ASSERT(!ninfo->isNull());
ninfo->m_offset = offset; ninfo->m_offset = offset;
if (blk.blockNumber() == p_block.blockNumber()) {
break;
}
offset = ninfo->bottom(); offset = ninfo->bottom();
blk = blk.next(); blk = blk.next();
} }
break;
} }
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
} }
} }
void VTextDocumentLayout::updateOffsetAfter(const QTextBlock &p_block) void VTextDocumentLayout::updateOffsetAfter(const QTextBlock &p_block)
{ {
BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block); BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block);
Q_ASSERT(info->hasOffset()); V_ASSERT(info->hasOffset());
qreal offset = info->bottom(); qreal offset = info->bottom();
QTextBlock blk = p_block.next(); QTextBlock blk = p_block.next();
while (blk.isValid()) { while (blk.isValid()) {
@ -599,7 +599,7 @@ qreal VTextDocumentLayout::layoutLines(const QTextBlock &p_block,
qreal p_availableWidth, qreal p_availableWidth,
qreal p_height) qreal p_height)
{ {
Q_ASSERT(p_block.isValid()); V_ASSERT(p_block.isValid());
// Handle block inline image. // Handle block inline image.
bool hasInlineImages = false; bool hasInlineImages = false;
@ -696,18 +696,18 @@ void VTextDocumentLayout::finishBlockLayout(const QTextBlock &p_block,
const QVector<Marker> &p_markers, const QVector<Marker> &p_markers,
const QVector<ImagePaintInfo> &p_images) const QVector<ImagePaintInfo> &p_images)
{ {
Q_ASSERT(p_block.isValid()); V_ASSERT(p_block.isValid());
ImagePaintInfo ipi; ImagePaintInfo ipi;
BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block); BlockLayoutInfo *info = VTextBlockData::layoutInfo(p_block);
Q_ASSERT(info->isNull()); V_ASSERT(info->isNull());
info->reset(); info->reset();
info->m_rect = blockRectFromTextLayout(p_block, &ipi); info->m_rect = blockRectFromTextLayout(p_block, &ipi);
Q_ASSERT(!info->m_rect.isNull()); V_ASSERT(!info->m_rect.isNull());
bool hasImage = false; bool hasImage = false;
if (ipi.isValid()) { if (ipi.isValid()) {
Q_ASSERT(p_markers.isEmpty()); V_ASSERT(p_markers.isEmpty());
Q_ASSERT(p_images.isEmpty()); V_ASSERT(p_images.isEmpty());
info->m_images.append(ipi); info->m_images.append(ipi);
hasImage = true; hasImage = true;
} else if (!p_markers.isEmpty()) { } else if (!p_markers.isEmpty()) {
@ -749,7 +749,7 @@ void VTextDocumentLayout::updateDocumentSize()
QTextBlock blk = document()->firstBlock(); QTextBlock blk = document()->firstBlock();
while (blk.isValid()) { while (blk.isValid()) {
const BlockLayoutInfo *ninfo = VTextBlockData::layoutInfo(blk); const BlockLayoutInfo *ninfo = VTextBlockData::layoutInfo(blk);
Q_ASSERT(ninfo->hasOffset()); V_ASSERT(ninfo->hasOffset());
if (m_width < ninfo->m_rect.width()) { if (m_width < ninfo->m_rect.width()) {
m_width = ninfo->m_rect.width(); m_width = ninfo->m_rect.width();
m_maximumWidthBlockNumber = blk.blockNumber(); m_maximumWidthBlockNumber = blk.blockNumber();
@ -787,7 +787,7 @@ QRectF VTextDocumentLayout::blockRectFromTextLayout(const QTextBlock &p_block,
// Handle block non-inline image. // Handle block non-inline image.
if (m_blockImageEnabled) { if (m_blockImageEnabled) {
VTextBlockData *blockData = VTextBlockData::blockData(p_block); VTextBlockData *blockData = VTextBlockData::blockData(p_block);
Q_ASSERT(blockData); V_ASSERT(blockData);
const QVector<VPreviewInfo *> &info = blockData->getPreviews(); const QVector<VPreviewInfo *> &info = blockData->getPreviews();
if (info.size() == 1) { if (info.size() == 1) {
const VPreviewedImageInfo& img = info.first()->m_imageInfo; const VPreviewedImageInfo& img = info.first()->m_imageInfo;
@ -1013,7 +1013,7 @@ qreal VTextDocumentLayout::fetchInlineImagesForOneLine(const QVector<VPreviewInf
for (int i = 0; i < p_info.size(); ++i) { for (int i = 0; i < p_info.size(); ++i) {
const VPreviewedImageInfo &img = p_info[i]->m_imageInfo; const VPreviewedImageInfo &img = p_info[i]->m_imageInfo;
Q_ASSERT(img.m_inline); V_ASSERT(img.m_inline);
if (img.m_startPos >= start && img.m_startPos < end) { if (img.m_startPos >= start && img.m_startPos < end) {
// Start of a new image. // Start of a new image.
@ -1098,8 +1098,8 @@ int VTextDocumentLayout::getTextWidthWithinTextLine(const QTextLayout *p_layout,
int p_length) int p_length)
{ {
QTextLine line = p_layout->lineForTextPosition(p_pos); QTextLine line = p_layout->lineForTextPosition(p_pos);
Q_ASSERT(line.isValid()); V_ASSERT(line.isValid());
Q_ASSERT(p_pos + p_length <= line.textStart() + line.textLength()); V_ASSERT(p_pos + p_length <= line.textStart() + line.textLength());
return line.cursorToX(p_pos + p_length) - line.cursorToX(p_pos); return line.cursorToX(p_pos + p_length) - line.cursorToX(p_pos);
} }

6
src/vtextdocumentlayoutdata.h
View File

@ -1,6 +1,8 @@
#ifndef VTEXTDOCUMENTLAYOUTDATA_H #ifndef VTEXTDOCUMENTLAYOUTDATA_H
#define VTEXTDOCUMENTLAYOUTDATA_H #define VTEXTDOCUMENTLAYOUTDATA_H
#include "utils/vutils.h"
// Denote the start and end position of a marker line. // Denote the start and end position of a marker line.
struct Marker struct Marker
{ {
@ -57,13 +59,13 @@ struct BlockLayoutInfo
qreal top() const qreal top() const
{ {
Q_ASSERT(hasOffset()); V_ASSERT(hasOffset());
return m_offset; return m_offset;
} }
qreal bottom() const qreal bottom() const
{ {
Q_ASSERT(hasOffset()); V_ASSERT(hasOffset());
return m_offset + m_rect.height(); return m_offset + m_rect.height();
} }