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

vim-mode: bug fix in block cursor mode

Browse Source
This commit is contained in:
Le Tan 2017-12-03 16:21:00 +08:00
parent 262c6acfd9
commit 7f230312df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/vvim.cpp
View File

@ -3987,8 +3987,6 @@ void VVim::processPasteAction(QList<Token> &p_tokens, bool p_pasteBefore)
changed = true; changed = true;
} }
setMode(VimMode::Normal);
} else { } else {
// Normal mode. // Normal mode.
if (isBlock) { if (isBlock) {
@ -4041,6 +4039,10 @@ void VVim::processPasteAction(QList<Token> &p_tokens, bool p_pasteBefore)
cursor.endEditBlock(); cursor.endEditBlock();
if (!checkMode(VimMode::Normal)) {
setMode(VimMode::Normal);
}
if (changed) { if (changed) {
m_editor->setTextCursorW(cursor); m_editor->setTextCursorW(cursor);
} }

2
src/vtextdocumentlayout.cpp
View File

@ -314,6 +314,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());
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) {
@ -1087,6 +1088,7 @@ 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());
Q_ASSERT(p_pos + p_length <= line.textStart() + line.textLength()); Q_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);
} }