Fix map item tooltips

nyalldawson · nyalldawson · commit 3decab9899a6 · 2017-11-24T10:24:36.000+10:00
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -100,10 +100,11 @@ void QgsLayoutItemMap::assignFreeId()
 
     maxId = std::max( maxId, map->mMapId );
   }
-  if ( !used )
-    return;
-  mMapId = maxId + 1;
-  mLayout->itemsModel()->updateItemDisplayName( this );
+  if ( used )
+  {
+    mMapId = maxId + 1;
+    mLayout->itemsModel()->updateItemDisplayName( this );
+  }
   updateToolTip();
 }
 
@@ -1253,7 +1254,7 @@ void QgsLayoutItemMap::connectUpdateSlot()
 
 void QgsLayoutItemMap::updateToolTip()
 {
-  setToolTip( tr( "Map %1" ).arg( displayName() ) );
+  setToolTip( displayName() );
 }
 
 QList<QgsMapLayer *> QgsLayoutItemMap::layersToRender( const QgsExpressionContext *context ) const

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,11 @@ void QgsLayoutItemMap::assignFreeId()`
`100`	`100`
`101`	`101`	`maxId = std::max( maxId, map->mMapId );`
`102`	`102`	`}`
`103`		`- if ( !used )`
`104`		`- return;`
`105`		`- mMapId = maxId + 1;`
`106`		`- mLayout->itemsModel()->updateItemDisplayName( this );`
	`103`	`+ if ( used )`
	`104`	`+ {`
	`105`	`+ mMapId = maxId + 1;`
	`106`	`+ mLayout->itemsModel()->updateItemDisplayName( this );`
	`107`	`+ }`
`107`	`108`	`updateToolTip();`
`108`	`109`	`}`
`109`	`110`
`@@ -1253,7 +1254,7 @@ void QgsLayoutItemMap::connectUpdateSlot()`
`1253`	`1254`
`1254`	`1255`	`void QgsLayoutItemMap::updateToolTip()`
`1255`	`1256`	`{`
`1256`		`- setToolTip( tr( "Map %1" ).arg( displayName() ) );`
	`1257`	`+ setToolTip( displayName() );`
`1257`	`1258`	`}`
`1258`	`1259`
`1259`	`1260`	`QList<QgsMapLayer > QgsLayoutItemMap::layersToRender( const QgsExpressionContext context ) const`