Snap to paper items and consider multipage compositions when showing …

…snap lines
qgis · Feb 12, 2013 · b45d8cb · b45d8cb
1 parent f4c5bc8
commit b45d8cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -639,7 +639,13 @@ void QgsComposerItem::changeItemRectangle( const QPointF& currentPosition,
         if ( alignX != -1 )
         {
           QGraphicsLineItem* item = hAlignSnapItem();
-          item->setLine( QLineF( alignX, 0, alignX,  mComposition->paperHeight() ) );
+          int numPages = mComposition->numPages();
+          double yLineCoord = 300; //default in case there is no single page
+          if ( numPages > 0 )
+          {
+            yLineCoord = mComposition->paperHeight() * numPages + mComposition->spaceBetweenPages() * ( numPages - 1 );
+          }
+          item->setLine( QLineF( alignX, 0, alignX,  yLineCoord ) );
           item->show();
         }
         else

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -1735,7 +1735,7 @@ void QgsComposition::collectAlignCoordinates( QMap< double, const QgsComposerIte
     const QgsComposerItem* currentItem = dynamic_cast<const QgsComposerItem *>( *itemIt );
     if ( excludeItem )
     {
-      if ( !currentItem || currentItem == excludeItem || currentItem->type() == QgsComposerItem::ComposerPaper )
+      if ( !currentItem || currentItem == excludeItem )
       {
         continue;
       }