Fix new annotations are shown even when annotations are hidden

nyalldawson · nyalldawson · commit f9f683dbd01e · 2018-09-24T18:26:51.000+10:00
Fixes #19117
diff --git a/src/gui/qgsmapcanvasannotationitem.cpp b/src/gui/qgsmapcanvasannotationitem.cpp
@@ -120,13 +120,20 @@ void QgsMapCanvasAnnotationItem::updateBoundingRect()
 
 void QgsMapCanvasAnnotationItem::onCanvasLayersChanged()
 {
-  if ( !mAnnotation->mapLayer() )
+  if ( !mMapCanvas->annotationsVisible() )
   {
-    setVisible( true );
+    setVisible( false );
   }
   else
   {
-    setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );
+    if ( !mAnnotation->mapLayer() )
+    {
+      setVisible( true );
+    }
+    else
+    {
+      setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,20 @@ void QgsMapCanvasAnnotationItem::updateBoundingRect()`
`120`	`120`
`121`	`121`	`void QgsMapCanvasAnnotationItem::onCanvasLayersChanged()`
`122`	`122`	`{`
`123`		`- if ( !mAnnotation->mapLayer() )`
	`123`	`+ if ( !mMapCanvas->annotationsVisible() )`
`124`	`124`	`{`
`125`		`- setVisible( true );`
	`125`	`+ setVisible( false );`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`129`		`- setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );`
	`129`	`+ if ( !mAnnotation->mapLayer() )`
	`130`	`+ {`
	`131`	`+ setVisible( true );`
	`132`	`+ }`
	`133`	`+ else`
	`134`	`+ {`
	`135`	`+ setVisible( mMapCanvas->mapSettings().layers().contains( mAnnotation->mapLayer() ) );`
	`136`	`+ }`
`130`	`137`	`}`
`131`	`138`	`}`
`132`	`139`