Don`t change current visibility flag of rubberband on updates

naihil · naihil · commit f11fdb044e0a · 2015-04-01T13:33:52.000+03:00
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -567,7 +567,7 @@ void QgsRubberBand::updateRect()
   QgsRectangle rect( topLeft.x(), topLeft.y(), topLeft.x() + r.width()*res, topLeft.y() - r.height()*res );
 
   setRect( rect );
-  setVisible( true );
+  setVisible( isVisible() );
 }
 
 void QgsRubberBand::updatePosition( )
diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
@@ -128,6 +128,7 @@ void TestQgsRubberband::testBoundingRect()
   mRubberband->setIconSize( 5 ); // default, but better be explicit
   mRubberband->setWidth( 1 );    // default, but better be explicit
   mRubberband->addGeometry( geom.data(), mPolygonLayer );
+  mRubberband->setVisible( true );
 
   // 20 pixels for the extent + 3 for pen & icon per side + 2 of padding
   QCOMPARE( mRubberband->boundingRect(), QRectF(QPointF(-1,-1),QSizeF(28,28)) );
@@ -151,6 +152,11 @@ void TestQgsRubberband::testBoundingRect()
     mapSize.height() - ( 30 + 3 ) * 2
   ) );
 
+  // Check visibility after zoom
+  mRubberband->setVisible( false );
+  mCanvas->zoomIn();
+  QCOMPARE( mRubberband->isVisible(), false );
+  
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ void QgsRubberBand::updateRect()`
`567`	`567`	`QgsRectangle rect( topLeft.x(), topLeft.y(), topLeft.x() + r.width()res, topLeft.y() - r.height()res );`
`568`	`568`
`569`	`569`	`setRect( rect );`
`570`		`- setVisible( true );`
	`570`	`+ setVisible( isVisible() );`
`571`	`571`	`}`
`572`	`572`
`573`	`573`	`void QgsRubberBand::updatePosition( )`