RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:17:35 +00:00
Code Issues Activity Actions

FontEditor: Make undo/redo compatible with multi-glyph selections

Browse source 
Previously the glyph undo stack saved an array of bytes representing
the restore state of an individual glyph when modified. Now the
selection undo stack saves a byte buffer of the entire selection,
letting us restore changes to multiple glyphs at once.
This commit is contained in:
thankyouverycool 2022-03-17 08:56:02 -04:00 • committed by Andreas Kling
parent 5c27ce2561
commit a3956da6dc
5 changed files with 99 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Userland/Applications/FontEditor/UndoSelection.h Normal file
View file

@ -0,0 +1,75 @@
/*
* Copyright (c) 2021-2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibGUI/Command.h>
#include <LibGUI/UndoStack.h>
#include <LibGfx/BitmapFont.h>
class UndoSelection : public RefCounted<UndoSelection> {
public:
explicit UndoSelection(int const start, int const size, Gfx::BitmapFont const& font)
: m_start(start)
, m_size(size)
, m_font(font)
{
}
NonnullRefPtr<UndoSelection> save_state()
{
auto state = adopt_ref(*new UndoSelection(m_start, m_size, *m_font));
size_t bytes_per_glyph = Gfx::GlyphBitmap::bytes_per_row() * font().glyph_height();
auto* rows = font().rows() + m_start * bytes_per_glyph;
auto* widths = font().widths() + m_start;
state->m_data.append(&rows[0], bytes_per_glyph * m_size);
state->m_data.append(&widths[0], m_size);
return state;
}
void restore_state(UndoSelection const& state)
{
size_t bytes_per_glyph = Gfx::GlyphBitmap::bytes_per_row() * font().glyph_height();
auto* rows = font().rows() + state.m_start * bytes_per_glyph;
auto* widths = font().widths() + state.m_start;
memcpy(rows, &state.m_data[0], bytes_per_glyph * state.m_size);
memcpy(widths, &state.m_data[bytes_per_glyph * state.m_size], state.m_size);
m_previous_active_glyph = state.m_start;
}
void set_start(int start) { m_start = start; }
void set_size(int size) { m_size = size; }
Gfx::BitmapFont& font() { return *m_font; }
u32 previous_active_glyph() const { return m_previous_active_glyph; }
private:
int m_start { 0 };
int m_size { 0 };
RefPtr<Gfx::BitmapFont> m_font;
ByteBuffer m_data;
u32 m_previous_active_glyph { 0 };
};
class SelectionUndoCommand : public GUI::Command {
public:
SelectionUndoCommand(UndoSelection& selection)
: m_undo_state(selection.save_state())
, m_undo_selection(selection)
{
}
virtual void undo() override
{
if (!m_redo_state)
m_redo_state = m_undo_state->save_state();
m_undo_selection.restore_state(*m_undo_state);
}
virtual void redo() override
{
m_undo_selection.restore_state(*m_redo_state);
}
private:
NonnullRefPtr<UndoSelection> m_undo_state;
RefPtr<UndoSelection> m_redo_state;
UndoSelection& m_undo_selection;
};