luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.QT4.EXT]

Browse source 
* BUG: Fix undo/redo management in Editor control.


git-svn-id: svn://localhost/gambas/trunk@3908 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2011-06-28 23:12:48 +00:00
parent 54e2893d52
commit 8f98fcd6af
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gb.qt4/src/ext/gdocument.cpp
View file

@ -70,6 +70,7 @@ public:
virtual bool merge(GCommand *) const { return false; }
virtual void process(GDocument *doc, bool undo) const { }
virtual bool linked() const { return false; }
virtual bool remove(GCommand *) const { return false; }
};
class GBeginCommand: public GCommand
@ -93,8 +94,8 @@ public:
Type type() const { return End; }
void print() const { qDebug("End"); }
int nest() const { return -1; }
bool merge(GCommand *o) const { return (o->type() == Begin); }
bool linked() const { return _linked; }
bool remove(GCommand *o) const { return (o->type() == Begin); }
};
class GDeleteCommand: public GCommand
@ -771,17 +772,25 @@ void GDocument::addUndo(GCommand *c)
{
if (blockUndo)
return;
//fprintf(stderr, "addUndo: ");
//c->print();
if (!undoList.isEmpty())
{
if (c->merge(undoList.last()))
{
//qDebug("merge");
//qDebug(" MERGE");
delete c;
return;
}
else if (c->remove(undoList.last()))
{
//qDebug(" REMOVE");
delete c;
delete undoList.take();
return;
}
}
undoList.append(c);
@ -845,7 +854,7 @@ bool GDocument::undo()
break;
}
//qDebug("END UNDO");
//qDebug("END UNDO: %d", nest);
end();
blockUndo = false;