struct Undo::Private
{
Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true),
- group_id(0), group_level(0) {}
+ group_id_(0), group_level_(0) {}
// Do one undo/redo step
void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
bool undo_finished_;
/// Current group Id.
- size_t group_id;
+ size_t group_id_;
/// Current group nesting nevel.
- size_t group_level;
+ size_t group_level_;
+ /// the position of cursor before the group was created
+ CursorData group_cur_before_;
};
d->undo_finished_ = true;
// We used to do that, but I believe it is better to keep
// groups (only used in Buffer::reload for now (JMarc)
- //d->group_id = 0;
- //d->group_level = 0;
+ //d->group_id_ = 0;
+ //d->group_level_ = 0;
}
CursorData const & cur_before,
UndoElementStack & stack)
{
- if (!group_level) {
+ if (!group_level_) {
LYXERR0("There is no group open (creating one)");
- ++group_id;
+ ++group_id_;
}
if (first_pit > last_pit)
return;
}
- LYXERR(Debug::UNDO, "Create undo element of group " << group_id);
+ LYXERR(Debug::UNDO, "Create undo element of group " << group_id_);
// create the position information of the Undo entry
- UndoElement undo(kind, cur_before, cell, from, end, 0, 0,
- buffer_.isClean(), group_id);
+ UndoElement undo(kind,
+ group_cur_before_.empty() ? cur_before : group_cur_before_,
+ cell, from, end, 0, 0, buffer_.isClean(), group_id_);
// fill in the real data to be saved
if (cell.inMathed()) {
void Undo::Private::doRecordUndoBufferParams(CursorData const & cur_before,
- UndoElementStack & stack)
+ UndoElementStack & stack)
{
- if (!group_level) {
+ if (!group_level_) {
LYXERR0("There is no group open (creating one)");
- ++group_id;
+ ++group_id_;
}
- LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id);
+ LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id_);
// create the position information of the Undo entry
- UndoElement undo(cur_before, buffer_.params(), buffer_.isClean(),
- group_id);
+ UndoElement undo(group_cur_before_.empty() ? cur_before : group_cur_before_,
+ buffer_.params(), buffer_.isClean(),
+ group_id_);
// push the undo entry to undo stack
stack.push(undo);
void Undo::beginUndoGroup()
{
- if (d->group_level == 0) {
+ if (d->group_level_ == 0) {
// create a new group
- ++d->group_id;
- LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id);
+ ++d->group_id_;
+ LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_);
}
- ++d->group_level;
+ ++d->group_level_;
+}
+
+
+void Undo::beginUndoGroup(CursorData const & cur_before)
+{
+ beginUndoGroup();
+ if (d->group_cur_before_.empty())
+ d->group_cur_before_ = cur_before;
}
void Undo::endUndoGroup()
{
- if (d->group_level == 0) {
+ if (d->group_level_ == 0) {
LYXERR0("There is no undo group to end here");
return;
}
- --d->group_level;
- if (d->group_level == 0) {
+ --d->group_level_;
+ if (d->group_level_ == 0) {
// real end of the group
- LYXERR(Debug::UNDO, "-------End of group " << d->group_id);
+ d->group_cur_before_ = CursorData();
+ LYXERR(Debug::UNDO, "-------End of group " << d->group_id_);
}
}
-void Undo::endUndoGroup(CursorData const & cur)
+void Undo::endUndoGroup(CursorData const & cur_after)
{
endUndoGroup();
if (!d->undostack_.empty() && d->undostack_.top().cur_after.empty())
- d->undostack_.top().cur_after = cur;
+ d->undostack_.top().cur_after = cur_after;
}