drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/studio] Add UndoCommand::mergeWith

Browse Source
This commit is contained in:
Gary Talent 2022-03-31 01:38:59 -05:00
parent 10d2f2c064
commit dd12857ba8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nostalgia/studio/lib/undostack.cpp
View File

@ -6,16 +6,24 @@
namespace nostalgia::studio { namespace nostalgia::studio {
bool UndoCommand::mergeWith(const UndoCommand*) noexcept {
return false;
}
void UndoStack::push(UndoCommand *cmd) noexcept { void UndoStack::push(UndoCommand *cmd) noexcept {
for (const auto i = m_stackIdx; i < m_stack.size();) { for (const auto i = m_stackIdx; i < m_stack.size();) {
oxIgnoreError(m_stack.erase(i)); oxIgnoreError(m_stack.erase(i));
} }
m_stack.emplace_back(cmd);
++m_stackIdx;
auto cmdId = cmd->commandId(); auto cmdId = cmd->commandId();
cmd->redo(); cmd->redo();
redoTriggered.emit(cmdId); redoTriggered.emit(cmdId);
changeTriggered.emit(cmdId); changeTriggered.emit(cmdId);
if (!m_stack.size() || !m_stack.back().value->mergeWith(cmd)) {
m_stack.emplace_back(cmd);
++m_stackIdx;
} else {
delete cmd;
}
} }
void UndoStack::redo() noexcept { void UndoStack::redo() noexcept {

1
src/nostalgia/studio/lib/undostack.hpp
View File

@ -18,6 +18,7 @@ class UndoCommand {
virtual void undo() noexcept = 0; virtual void undo() noexcept = 0;
[[nodiscard]] [[nodiscard]]
virtual int commandId() const noexcept = 0; virtual int commandId() const noexcept = 0;
virtual bool mergeWith(const UndoCommand *cmd) noexcept;
}; };
class UndoStack { class UndoStack {