beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
Notes: sideshowbarker 2024-07-19 01:19:03 +09:00 
Author: https://github.com/BenJilks
Commit: https://github.com/SerenityOS/serenity/commit/7707ebcd634
Pull-request: https://github.com/SerenityOS/serenity/pull/3792
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/linusg
2 changed files with 36 additions and 53 deletions
Show stats 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())
return;
auto& undo_container = m_stack[m_stack_index];
auto& undo_vector = undo_container.m_undo_vector;
auto pop_container_and_undo = [this]() {
for (;;) {
if (m_stack_index >= m_stack.size())
break;
//If we try to undo a empty vector, delete it and skip over.
if (undo_vector.is_empty()) {
m_stack.remove(m_stack_index);
undo();
return;
}
auto& container = m_stack[m_stack_index++];
if (container.m_undo_vector.size() == 0)
continue;
for (auto& command : container.m_undo_vector)
command.undo();
break;
}
};
for (size_t i = 0; i < undo_vector.size(); i++) {
auto& undo_command = undo_vector[i];
undo_command.undo();
}
m_stack_index++;
// If this is the first undo, finish off our current combo
if (m_stack_index == 0)
finalize_current_combo();
pop_container_and_undo();
}
void UndoStack::redo()
@ -65,55 +67,37 @@ void UndoStack::redo()
if (!can_redo())
return;
auto& undo_container = m_stack[m_stack_index - 1];
auto& redo_vector = undo_container.m_undo_vector;
for (int i = static_cast<int>(redo_vector.size()) - 1; i >= 0; i--) {
auto& undo_command = redo_vector[i];
undo_command.redo();
}
m_stack_index--;
m_stack_index -= 1;
auto& vector = m_stack[m_stack_index].m_undo_vector;
for (int i = vector.size() - 1; i >= 0; i--)
vector[i].redo();
}
void UndoStack::push(NonnullOwnPtr<Command>&& command)
{
if (m_stack.is_empty()) {
auto undo_commands_container = make<UndoCommandsContainer>();
m_stack.prepend(move(undo_commands_container));
if (m_stack.is_empty())
finalize_current_combo();
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)
for (size_t i = 1; i < m_stack_index; i++)
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));
auto& current_vector = m_stack.first().m_undo_vector;
current_vector.prepend(move(command));
}
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;
auto& undo_vector = m_stack[0].m_undo_vector;
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();
auto undo_commands_container = make<UndoCommandsContainer>();
m_stack.prepend(move(undo_commands_container));
}
}

3
Libraries/LibGUI/UndoStack.h
View file

@ -39,7 +39,7 @@ public:
void push(NonnullOwnPtr<Command>&&);
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 redo();
@ -53,7 +53,6 @@ private:
NonnullOwnPtrVector<UndoCommandsContainer> m_stack;
size_t m_stack_index { 0 };
size_t m_last_updated_undo_vector_size { 0 };
};
}