[composer] Ignore locked items when using move item content tool. Keeps a

nyalldawson · nyalldawson · commit 583151af3cc9 · 2014-09-29T19:21:01.000+10:00
consistent behaviour with the move/resize item tool, and allows for
moving item content for maps which are stacked below locked items.
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -304,13 +304,13 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
         return;
       }
 
-      //find highest QgsComposerItem at clicked position
+      //find highest non-locked QgsComposerItem at clicked position
       //(other graphics items may be higher, eg selection handles)
       QList<QGraphicsItem*>::iterator itemIter = itemsAtCursorPos.begin();
       for ( ; itemIter != itemsAtCursorPos.end(); ++itemIter )
       {
         QgsComposerItem* item = dynamic_cast<QgsComposerItem *>(( *itemIter ) );
-        if ( item )
+        if ( item && !item->positionLock() )
         {
           //we've found the highest QgsComposerItem
           mMoveContentStartPos = scenePoint;

Original file line number	Diff line number	Diff line change
`@@ -304,13 +304,13 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )`
`304`	`304`	`return;`
`305`	`305`	`}`
`306`	`306`
`307`		`- //find highest QgsComposerItem at clicked position`
	`307`	`+ //find highest non-locked QgsComposerItem at clicked position`
`308`	`308`	`//(other graphics items may be higher, eg selection handles)`
`309`	`309`	`QList<QGraphicsItem*>::iterator itemIter = itemsAtCursorPos.begin();`
`310`	`310`	`for ( ; itemIter != itemsAtCursorPos.end(); ++itemIter )`
`311`	`311`	`{`
`312`	`312`	`QgsComposerItem* item = dynamic_cast<QgsComposerItem >(( itemIter ) );`
`313`		`- if ( item )`
	`313`	`+ if ( item && !item->positionLock() )`
`314`	`314`	`{`
`315`	`315`	`//we've found the highest QgsComposerItem`
`316`	`316`	`mMoveContentStartPos = scenePoint;`