xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Window: undo group cleanup and fix of append method

Browse Source
This commit is contained in:
Maxime Coste 2011-09-24 12:39:40 +00:00
parent 9b865cea39
commit 1f0b06a855
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/window.cc
View File

@ -23,6 +23,16 @@ void Selection::offset(int offset)
m_last += offset; m_last += offset;
} }
struct scoped_undo_group
{
scoped_undo_group(Buffer& buffer)
: m_buffer(buffer) { m_buffer.begin_undo_group(); }
~scoped_undo_group() { m_buffer.end_undo_group(); }
private:
Buffer& m_buffer;
};
Window::Window(Buffer& buffer) Window::Window(Buffer& buffer)
: m_buffer(buffer), : m_buffer(buffer),
m_position(0, 0), m_position(0, 0),
@ -34,7 +44,7 @@ Window::Window(Buffer& buffer)
void Window::erase() void Window::erase()
{ {
m_buffer.begin_undo_group(); scoped_undo_group undo_group(m_buffer);
if (m_selections.empty()) if (m_selections.empty())
{ {
BufferIterator cursor = iterator_at(m_cursor); BufferIterator cursor = iterator_at(m_cursor);
@ -48,7 +58,6 @@ void Window::erase()
} }
if (not m_selections.empty()) if (not m_selections.empty())
m_cursor = line_and_column_at(m_selections.back().last()); m_cursor = line_and_column_at(m_selections.back().last());
m_buffer.end_undo_group();
} }
static WindowCoord measure_string(const Window::String& string) static WindowCoord measure_string(const Window::String& string)
@ -69,7 +78,8 @@ static WindowCoord measure_string(const Window::String& string)
void Window::insert(const String& string) void Window::insert(const String& string)
{ {
m_buffer.begin_undo_group(); scoped_undo_group undo_group(m_buffer);
if (m_selections.empty()) if (m_selections.empty())
{ {
m_buffer.insert(iterator_at(m_cursor), string); m_buffer.insert(iterator_at(m_cursor), string);
@ -81,23 +91,23 @@ void Window::insert(const String& string)
m_buffer.insert(sel.begin(), string); m_buffer.insert(sel.begin(), string);
sel.offset(string.length()); sel.offset(string.length());
} }
m_buffer.end_undo_group();
} }
void Window::append(const String& string) void Window::append(const String& string)
{ {
m_buffer.begin_undo_group();
if (m_selections.empty()) if (m_selections.empty())
{ {
move_cursor(WindowCoord(0 , 1)); move_cursor(WindowCoord(0 , 1));
insert(string); insert(string);
} }
else
for (auto& sel : m_selections)
{ {
m_buffer.insert(sel.end(), string); scoped_undo_group undo_group(m_buffer);
for (auto& sel : m_selections)
{
m_buffer.insert(sel.end(), string);
}
} }
m_buffer.end_undo_group();
} }
bool Window::undo() bool Window::undo()