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

[composer] Don't consider removed items in z list

Browse Source
This commit is contained in:
Sandro Mani 2014-04-07 11:41:10 +02:00 committed by Nyall Dawson
parent d8761de0b4
commit 24ce7456f4
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/composer/qgscomposition.cpp
View File

@ -1193,12 +1193,19 @@ void QgsComposition::raiseItem( QgsComposerItem* item )
QMutableLinkedListIterator<QgsComposerItem*> it( mItemZList );
if ( it.findNext( item ) )
{
if ( it.hasNext() )
it.remove();
while ( it.hasNext() )
{
it.remove();
//search through item z list to find next item which is present in the scene
//(deleted items still exist in the z list so that they can be restored to their correct stacking order,
//but since they are not in the scene they should be ignored here)
it.next();
it.insert( item );
if ( it.value() && it.value()->scene() )
{
break;
}
}
it.insert( item );
}
}
@ -1291,13 +1298,19 @@ void QgsComposition::lowerItem( QgsComposerItem* item )
QMutableLinkedListIterator<QgsComposerItem*> it( mItemZList );
if ( it.findNext( item ) )
{
it.previous();
if ( it.hasPrevious() )
it.remove();
while ( it.hasPrevious() )
{
it.remove();
//search through item z list to find previous item which is present in the scene
//(deleted items still exist in the z list so that they can be restored to their correct stacking order,
//but since they are not in the scene they should be ignored here)
it.previous();
it.insert( item );
if ( it.value() && it.value()->scene() )
{
break;
}
}
it.insert( item );
}
}