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

Window: do not manage undo groups when an inserter is active

Browse Source
This commit is contained in:
Maxime Coste 2011-12-21 18:56:32 +00:00
parent 913ee3f096
commit 6c817c8117
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/window.cc
View File

@ -82,8 +82,13 @@ BufferIterator Window::cursor_iterator() const
void Window::erase() void Window::erase()
{ {
scoped_undo_group undo_group(m_buffer); if (m_current_inserter == nullptr)
erase_noundo(); {
scoped_undo_group undo_group(m_buffer);
erase_noundo();
}
else
erase_noundo();
} }
void Window::erase_noundo() void Window::erase_noundo()
@ -119,8 +124,13 @@ static DisplayCoord measure_string(const Window::String& string)
void Window::insert(const String& string) void Window::insert(const String& string)
{ {
scoped_undo_group undo_group(m_buffer); if (m_current_inserter == nullptr)
insert_noundo(string); {
scoped_undo_group undo_group(m_buffer);
insert_noundo(string);
}
else
insert_noundo(string);
} }
void Window::insert_noundo(const String& string) void Window::insert_noundo(const String& string)
@ -132,8 +142,13 @@ void Window::insert_noundo(const String& string)
void Window::append(const String& string) void Window::append(const String& string)
{ {
scoped_undo_group undo_group(m_buffer); if (m_current_inserter == nullptr)
append_noundo(string); {
scoped_undo_group undo_group(m_buffer);
append_noundo(string);
}
else
append_noundo(string);
} }
void Window::append_noundo(const String& string) void Window::append_noundo(const String& string)
@ -145,12 +160,19 @@ void Window::append_noundo(const String& string)
void Window::replace(const std::string& string) void Window::replace(const std::string& string)
{ {
scoped_undo_group undo_group(m_buffer); if (m_current_inserter == nullptr)
erase_noundo(); {
insert_noundo(string); scoped_undo_group undo_group(m_buffer);
erase_noundo();
insert_noundo(string);
}
else
{
erase_noundo();
insert_noundo(string);
}
} }
bool Window::undo() bool Window::undo()
{ {
return m_buffer.undo(); return m_buffer.undo();