Skip to content

Commit

Permalink
Fix handling of overlapping item commands
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Oct 9, 2017
1 parent 8fb2c3c commit 30eab10
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 8 deletions.
18 changes: 11 additions & 7 deletions src/core/layout/qgslayoutundostack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,31 @@ void QgsLayoutUndoStack::beginCommand( QgsLayoutUndoObjectInterface *object, con
return;
}

mActiveCommand.reset( object->createCommand( commandText, id, nullptr ) );
mActiveCommand->saveBeforeState();
mActiveCommands.emplace_back( std::unique_ptr< QgsAbstractLayoutUndoCommand >( object->createCommand( commandText, id, nullptr ) ) );
mActiveCommands.back()->saveBeforeState();
}

void QgsLayoutUndoStack::endCommand()
{
if ( !mActiveCommand )
if ( mActiveCommands.empty() )
return;

mActiveCommand->saveAfterState();
if ( mActiveCommand->containsChange() ) //protect against empty commands
mActiveCommands.back()->saveAfterState();
if ( mActiveCommands.back()->containsChange() ) //protect against empty commands
{
mUndoStack->push( mActiveCommand.release() );
mUndoStack->push( mActiveCommands.back().release() );
mActiveCommands.pop_back();

mLayout->project()->setDirty( true );
}
}

void QgsLayoutUndoStack::cancelCommand()
{
mActiveCommand.reset();
if ( mActiveCommands.empty() )
return;

mActiveCommands.pop_back();
}

QUndoStack *QgsLayoutUndoStack::stack()
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutundostack.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CORE_EXPORT QgsLayoutUndoStack

std::unique_ptr< QUndoStack > mUndoStack;

std::unique_ptr< QgsAbstractLayoutUndoCommand > mActiveCommand;
std::vector< std::unique_ptr< QgsAbstractLayoutUndoCommand > > mActiveCommands;

#ifdef SIP_RUN
QgsLayoutUndoStack( const QgsLayoutUndoStack &other );
Expand Down
31 changes: 31 additions & 0 deletions tests/src/core/testqgslayoutitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ class TestQgsLayoutItem: public QObject
void writeReadXmlProperties();
void undoRedo();
void multiItemUndo();
void overlappingUndo();

private:

Expand Down Expand Up @@ -1481,6 +1482,36 @@ void TestQgsLayoutItem::multiItemUndo()
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );
}

void TestQgsLayoutItem::overlappingUndo()
{
QgsProject proj;
QgsLayout l( &proj );

QgsLayoutItemRectangularShape *item = new QgsLayoutItemRectangularShape( &l );
l.addLayoutItem( item );
item->attemptMove( QgsLayoutPoint( 10, 10 ) );
QgsLayoutItemRectangularShape *item2 = new QgsLayoutItemRectangularShape( &l );
l.addLayoutItem( item2 );
item2->attemptMove( QgsLayoutPoint( 20, 20 ) );

//commands overlap
l.undoStack()->beginCommand( item, tr( "Item moved" ), QgsLayoutItem::UndoIncrementalMove );
item->attemptMove( QgsLayoutPoint( 1, 1 ) );
l.undoStack()->beginCommand( item2, tr( "Item moved" ), QgsLayoutItem::UndoIncrementalMove );
item2->attemptMove( QgsLayoutPoint( 21, 21 ) );
l.undoStack()->endCommand();
l.undoStack()->endCommand();

// undo should remove item move
l.undoStack()->stack()->undo();
QCOMPARE( item2->positionWithUnits(), QgsLayoutPoint( 21, 21 ) );
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );
l.undoStack()->stack()->undo();
QCOMPARE( item2->positionWithUnits(), QgsLayoutPoint( 20, 20 ) );
QCOMPARE( item->positionWithUnits(), QgsLayoutPoint( 10, 10 ) );

}

QgsLayoutItem *TestQgsLayoutItem::createCopyViaXml( QgsLayout *layout, QgsLayoutItem *original )
{
//save original item to xml
Expand Down

0 comments on commit 30eab10

Please sign in to comment.