Skip to content

fix: merge column-edit undo commands for single-step undo #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pppanghu77 wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
+28 −2
Open

fix: merge column-edit undo commands for single-step undo #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/editor/inserttextundocommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@
} else {
int cnt = m_ColumnEditSelections.size();
for (int i = 0; i < cnt; i++) {
m_ColumnEditSelections[i].cursor.deleteChar();
QTextCursor &cursor = m_ColumnEditSelections[i].cursor;
int endPos = cursor.selectionEnd();
int startPos = endPos - m_sInsertText.length();
cursor.setPosition(startPos);
cursor.setPosition(endPos, QTextCursor::KeepAnchor);
cursor.deleteChar();
}

if (m_pEdit && !m_ColumnEditSelections.isEmpty()) {
Expand Down Expand Up @@ -76,7 +81,7 @@
int cnt = m_ColumnEditSelections.size();
for (int i = 0; i < cnt; i++) {
m_ColumnEditSelections[i].cursor.insertText(m_sInsertText);
m_ColumnEditSelections[i].cursor.setPosition(m_ColumnEditSelections[i].cursor.position() - m_sInsertText.length() + 1,
m_ColumnEditSelections[i].cursor.setPosition(m_ColumnEditSelections[i].cursor.position() - m_sInsertText.length(),
QTextCursor::KeepAnchor);
}

Expand All @@ -88,6 +93,24 @@
}
}

int InsertTextUndoCommand::id() const
{
return kColumnEditInsertCommandId;
}

bool InsertTextUndoCommand::mergeWith(const QUndoCommand *other)

Check warning on line 101 in src/editor/inserttextundocommand.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'mergeWith' is never used.
{
if (other->id() != id())
return false;

const auto *cmd = static_cast<const InsertTextUndoCommand *>(other);
if (m_ColumnEditSelections.isEmpty() || cmd->m_ColumnEditSelections.isEmpty())
return false;

m_sInsertText += cmd->m_sInsertText;
return true;
}

/**
* @class MidButtonInsertTextUndoCommand
* @brief 用于鼠标中键黏贴的插入撤销项，使用 QClipboard::Selection 类型插入选中的数据，
Expand Down
3 changes: 3 additions & 0 deletions src/editor/inserttextundocommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class InsertTextUndoCommand : public QUndoCommand
QUndoCommand *parent = nullptr);
virtual void undo();
virtual void redo();
int id() const override;
bool mergeWith(const QUndoCommand *other) override;

private:
QPlainTextEdit *m_pEdit = nullptr;
Expand All @@ -30,6 +32,7 @@ class InsertTextUndoCommand : public QUndoCommand
QString m_sInsertText;
QList<QTextEdit::ExtraSelection> m_ColumnEditSelections;
QString m_selectText = QString();
static constexpr int kColumnEditInsertCommandId = 1001;
};

/**
Expand Down
Loading