LibGUI: Support merging of adjacent commands on the UndoStack

When pushing a new command on an undo stack, we will now attempt to
merge it into the stack's current command.

Merging is implemented by overriding the "merge_with(Command const&)"
virtual on GUI::Command. :^)
This commit is contained in:
Andreas Kling 2021-05-08 16:49:36 +02:00
parent 244665d99c
commit ff912946ae
Notes: sideshowbarker 2024-07-18 18:29:00 +09:00
2 changed files with 8 additions and 0 deletions

View File

@ -19,6 +19,8 @@ public:
String action_text() const { return m_action_text; }
virtual bool merge_with(Command const&) { return false; }
protected:
Command() { }
void set_action_text(const String& text) { m_action_text = text; }

View File

@ -77,6 +77,12 @@ void UndoStack::push(NonnullOwnPtr<Command>&& command)
finalize_current_combo();
}
if (!m_stack.last().commands.is_empty()) {
bool merged = m_stack.last().commands.last().merge_with(*command);
if (merged)
return;
}
m_stack.last().commands.append(move(command));
if (on_state_change)