[composer] Make sure rulers are updated when paper size changes

nyalldawson · nyalldawson · commit d79b12b174b1 · 2013-12-29T14:02:28.000+11:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -565,6 +565,10 @@ void QgsComposer::connectSlots()
   connect( mComposition, SIGNAL( composerShapeAdded( QgsComposerShape* ) ), this, SLOT( addComposerShape( QgsComposerShape* ) ) );
   connect( mComposition, SIGNAL( composerTableAdded( QgsComposerAttributeTable* ) ), this, SLOT( addComposerTable( QgsComposerAttributeTable* ) ) );
   connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( deleteItem( QgsComposerItem* ) ) );
+  connect( mComposition, SIGNAL( paperSizeChanged() ), mHorizontalRuler, SLOT( update() ) );
+  connect( mComposition, SIGNAL( paperSizeChanged() ), mVerticalRuler, SLOT( update() ) );
+  connect( mComposition, SIGNAL( nPagesChanged() ), mHorizontalRuler, SLOT( update() ) );
+  connect( mComposition, SIGNAL( nPagesChanged() ), mVerticalRuler, SLOT( update() ) );
 
   //listen out for position updates from the QgsComposerView
   connect( mView, SIGNAL( cursorPosChanged( QPointF ) ), this, SLOT( updateStatusCursorPos( QPointF ) ) );
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -155,6 +155,7 @@ void QgsComposition::setPaperSize( double width, double height )
     mPages.at( i )->setSceneRect( QRectF( 0, currentY, width, height ) );
     currentY += ( height + mSpaceBetweenPages );
   }
+  emit paperSizeChanged();
 }
 
 double QgsComposition::paperHeight() const

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ void QgsComposition::setPaperSize( double width, double height )`
`155`	`155`	`mPages.at( i )->setSceneRect( QRectF( 0, currentY, width, height ) );`
`156`	`156`	`currentY += ( height + mSpaceBetweenPages );`
`157`	`157`	`}`
	`158`	`+ emit paperSizeChanged();`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`double QgsComposition::paperHeight() const`