RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:57:45 +00:00
Code Issues Activity Actions

LibGUI: Remove UndoStack's automatic command combo'ing

Browse source 
UndoStack will now merge adjacent commands *if they want to be merged*
instead of bundling everything you push onto it until you tell it
to "finalize the combo."

This uses less memory and gives applications full control over how
their undo stacks end up. :^)
This commit is contained in:
Andreas Kling 2021-05-08 21:08:41 +02:00
parent 81bc861085
commit 161568103e
5 changed files with 37 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Userland/Libraries/LibGUI/UndoStack.cpp
View file

@ -19,14 +19,14 @@ UndoStack::~UndoStack()
bool UndoStack::can_undo() const
{
return m_stack_index > 0 || (m_stack.size() == 1 && m_stack[0].commands.size() > 0);
return m_stack_index > 0;
}
bool UndoStack::can_redo() const
{
if (m_stack.is_empty())
return false;
return m_stack_index != m_stack.size() - 1;
return m_stack_index != m_stack.size();
}
void UndoStack::undo()
@ -34,10 +34,8 @@ void UndoStack::undo()
if (!can_undo())
return;
finalize_current_combo();
auto& combo = m_stack[--m_stack_index];
for (auto i = static_cast<ssize_t>(combo.commands.size()) - 1; i >= 0; i--)
combo.commands[i].undo();
auto& command = m_stack[--m_stack_index];
command.undo();
if (on_state_change)
on_state_change();
@ -48,69 +46,39 @@ void UndoStack::redo()
if (!can_redo())
return;
auto& commands = m_stack[m_stack_index++].commands;
for (auto& command : commands)
command.redo();
auto& command = m_stack[m_stack_index++];
command.redo();
if (on_state_change)
on_state_change();
}
void UndoStack::pop()
void UndoStack::push(NonnullOwnPtr<Command> command)
{
VERIFY(!m_stack.is_empty());
m_stack.take_last();
// If the stack cursor is behind the top of the stack, nuke everything from here to the top.
while (m_stack.size() != m_stack_index)
m_stack.take_last();
if (m_clean_index.has_value() && m_clean_index.value() > m_stack.size())
m_clean_index = {};
}
void UndoStack::push(NonnullOwnPtr<Command>&& command)
{
if (m_stack.is_empty())
finalize_current_combo();
// If the stack cursor is behind the top of the stack, nuke everything from here to the top.
if (m_stack_index != m_stack.size() - 1) {
while (m_stack.size() != m_stack_index) {
pop();
}
finalize_current_combo();
}
if (!m_stack.last().commands.is_empty()) {
bool merged = m_stack.last().commands.last().merge_with(*command);
if (merged)
if (!m_stack.is_empty()) {
if (m_stack.last().merge_with(*command))
return;
}
m_stack.last().commands.append(move(command));
m_stack.append(move(command));
m_stack_index = m_stack.size();
if (on_state_change)
on_state_change();
}
void UndoStack::finalize_current_combo()
{
if (m_stack.is_empty()) {
m_stack.append(make<Combo>());
return;
}
if (!m_stack.last().commands.is_empty()) {
m_stack.append(make<Combo>());
m_stack_index = m_stack.size() - 1;
if (on_state_change)
on_state_change();
}
}
void UndoStack::set_current_unmodified()
{
finalize_current_combo();
if (m_clean_index.has_value() && m_clean_index.value() == m_stack_index)
return;
m_clean_index = m_stack_index;
if (on_state_change)
@ -119,14 +87,12 @@ void UndoStack::set_current_unmodified()
bool UndoStack::is_current_modified() const
{
if (m_stack.is_empty())
return false;
if (!m_clean_index.has_value())
return true;
if (m_stack_index != m_clean_index.value())
return true;
if (m_stack.is_empty())
return false;
if (m_stack_index == m_stack.size() - 1 && !m_stack[m_stack_index].commands.is_empty())
return true;
return false;
}