sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-25 00:05:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix redoing group visibility creates multiple new undo commands

Browse Source
This commit is contained in:
Nyall Dawson 2017-10-10 09:37:29 +10:00
parent 30eab10619
commit fdc0f75066
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/layout/qgslayoutitemgroup.cpp
View File

@ -115,10 +115,14 @@ void QgsLayoutItemGroup::setVisibility( const bool visible )
{ {
if ( !item ) if ( !item )
continue; continue;
bool prev = item->mBlockUndoCommands;
item->mBlockUndoCommands = mBlockUndoCommands;
item->setVisibility( visible ); item->setVisibility( visible );
item->mBlockUndoCommands = prev;
} }
//lastly set visibility for group item itself //lastly set visibility for group item itself
QgsLayoutItem::setVisibility( visible ); QgsLayoutItem::setVisibility( visible );
if ( !shouldBlockUndoCommands() ) if ( !shouldBlockUndoCommands() )
mLayout->undoStack()->endMacro(); mLayout->undoStack()->endMacro();
} }

17
tests/src/core/testqgslayoutitemgroup.cpp
View File

@ -301,6 +301,23 @@ void TestQgsLayoutItemGroup::groupVisibility()
QVERIFY( item->isVisible() ); QVERIFY( item->isVisible() );
QVERIFY( item2->isVisible() ); QVERIFY( item2->isVisible() );
QVERIFY( group->isVisible() ); QVERIFY( group->isVisible() );
l.undoStack()->stack()->undo();
QVERIFY( !item->isVisible() );
QVERIFY( !item2->isVisible() );
QVERIFY( !group->isVisible() );
l.undoStack()->stack()->undo();
QVERIFY( item->isVisible() );
QVERIFY( item2->isVisible() );
QVERIFY( group->isVisible() );
l.undoStack()->stack()->redo();
QVERIFY( !item->isVisible() );
QVERIFY( !item2->isVisible() );
QVERIFY( !group->isVisible() );
l.undoStack()->stack()->redo();
QVERIFY( item->isVisible() );
QVERIFY( item2->isVisible() );
QVERIFY( group->isVisible() );
} }
void TestQgsLayoutItemGroup::moveGroup() void TestQgsLayoutItemGroup::moveGroup()