RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:47:34 +00:00
Code Issues Activity Actions

LibGUI: Fix undo stack

Browse source 
This would undo all commands at once instead of one at a time.
This commit is contained in:
BenJilks 2020-11-13 12:57:33 +00:00 • committed by Andreas Kling
parent 76aeb7cad8
commit 7707ebcd63
2 changed files with 36 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

86
Libraries/LibGUI/UndoStack.cpp
View file

@ -42,22 +42,24 @@ void UndoStack::undo()
if (!can_undo()) if (!can_undo())
return; return;
auto& undo_container = m_stack[m_stack_index]; auto pop_container_and_undo = [this]() {
auto& undo_vector = undo_container.m_undo_vector; for (;;) {
if (m_stack_index >= m_stack.size())
break;
//If we try to undo a empty vector, delete it and skip over. auto& container = m_stack[m_stack_index++];
if (undo_vector.is_empty()) { if (container.m_undo_vector.size() == 0)
m_stack.remove(m_stack_index); continue;
undo(); for (auto& command : container.m_undo_vector)
return; command.undo();
} break;
}
};
for (size_t i = 0; i < undo_vector.size(); i++) { // If this is the first undo, finish off our current combo
auto& undo_command = undo_vector[i]; if (m_stack_index == 0)
undo_command.undo(); finalize_current_combo();
} pop_container_and_undo();
m_stack_index++;
} }
void UndoStack::redo() void UndoStack::redo()
@ -65,55 +67,37 @@ void UndoStack::redo()
if (!can_redo()) if (!can_redo())
return; return;
auto& undo_container = m_stack[m_stack_index - 1]; m_stack_index -= 1;
auto& redo_vector = undo_container.m_undo_vector; auto& vector = m_stack[m_stack_index].m_undo_vector;
for (int i = vector.size() - 1; i >= 0; i--)
for (int i = static_cast<int>(redo_vector.size()) - 1; i >= 0; i--) { vector[i].redo();
auto& undo_command = redo_vector[i];
undo_command.redo();
}
m_stack_index--;
} }
void UndoStack::push(NonnullOwnPtr<Command>&& command) void UndoStack::push(NonnullOwnPtr<Command>&& command)
{ {
if (m_stack.is_empty()) { if (m_stack.is_empty())
auto undo_commands_container = make<UndoCommandsContainer>(); finalize_current_combo();
m_stack.prepend(move(undo_commands_container));
if (m_stack_index > 0) {
for (size_t i = 0; i < m_stack_index; i++)
m_stack.remove(0);
m_stack_index = 0;
finalize_current_combo();
} }
// Clear the elements of the stack before the m_undo_stack_index (Excluding our new element) auto& current_vector = m_stack.first().m_undo_vector;
for (size_t i = 1; i < m_stack_index; i++) current_vector.prepend(move(command));
m_stack.remove(1);
if (m_stack_index > 0 && !m_stack.is_empty())
m_stack[0].m_undo_vector.clear();
m_stack_index = 0;
m_stack[0].m_undo_vector.prepend(move(command));
} }
void UndoStack::finalize_current_combo() void UndoStack::finalize_current_combo()
{ {
if (m_stack.is_empty()) if (m_stack_index > 0)
return;
if (m_stack.size() != 0 && m_stack.first().m_undo_vector.size() == 0)
return; return;
auto& undo_vector = m_stack[0].m_undo_vector; auto undo_commands_container = make<UndoCommandsContainer>();
m_stack.prepend(move(undo_commands_container));
if (undo_vector.size() == m_last_updated_undo_vector_size && !undo_vector.is_empty()) {
auto undo_commands_container = make<UndoCommandsContainer>();
m_stack.prepend(move(undo_commands_container));
// Note: Remove dbg() if we're 100% sure there are no bugs left.
dbg() << "Undo stack increased to " << m_stack.size();
// Shift the index to the left since we're adding an empty container.
if (m_stack_index > 0)
m_stack_index++;
}
m_last_updated_undo_vector_size = undo_vector.size();
} }
} }

3
Libraries/LibGUI/UndoStack.h
View file

@ -39,7 +39,7 @@ public:
void push(NonnullOwnPtr<Command>&&); void push(NonnullOwnPtr<Command>&&);
bool can_undo() const { return m_stack_index < m_stack.size() && !m_stack.is_empty(); } bool can_undo() const { return m_stack_index < m_stack.size() && !m_stack.is_empty(); }
bool can_redo() const { return m_stack_index > 0 && m_stack[m_stack_index - 1].m_undo_vector.size() > 0 && !m_stack.is_empty(); } bool can_redo() const { return m_stack_index > 0 && !m_stack.is_empty(); }
void undo(); void undo();
void redo(); void redo();
@ -53,7 +53,6 @@ private:
NonnullOwnPtrVector<UndoCommandsContainer> m_stack; NonnullOwnPtrVector<UndoCommandsContainer> m_stack;
size_t m_stack_index { 0 }; size_t m_stack_index { 0 };
size_t m_last_updated_undo_vector_size { 0 };
}; };
} }