[layouts] Don't force open item properties when undoing/redoing

nyalldawson · nyalldawson · commit cc9f7af0bf43 · 2018-01-29T11:12:33.000+10:00
diff --git a/src/app/layout/qgslayoutappmenuprovider.cpp b/src/app/layout/qgslayoutappmenuprovider.cpp
@@ -112,7 +112,7 @@ QMenu *QgsLayoutAppMenuProvider::createContextMenu( QWidget *parent, QgsLayout *
     QAction *pagePropertiesAction = new QAction( tr( "Page Properties…" ), menu );
     connect( pagePropertiesAction, &QAction::triggered, this, [this, page]()
     {
-      mDesigner->showItemOptions( page );
+      mDesigner->showItemOptions( page, true );
     } );
     menu->addAction( pagePropertiesAction );
     QAction *removePageAction = new QAction( tr( "Remove Page" ), menu );
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -1456,7 +1456,7 @@ void QgsLayoutDesignerDialog::undoRedoOccurredForItems( const QSet<QString> item
   mBlockItemOptions = false;
 
   if ( focusItem )
-    showItemOptions( focusItem );
+    showItemOptions( focusItem, false );
 }
 
 void QgsLayoutDesignerDialog::saveAsTemplate()

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ QMenu QgsLayoutAppMenuProvider::createContextMenu( QWidget parent, QgsLayout *`
`112`	`112`	`QAction *pagePropertiesAction = new QAction( tr( "Page Properties…" ), menu );`
`113`	`113`	`connect( pagePropertiesAction, &QAction::triggered, this, [this, page]()`
`114`	`114`	`{`
`115`		`- mDesigner->showItemOptions( page );`
	`115`	`+ mDesigner->showItemOptions( page, true );`
`116`	`116`	`} );`
`117`	`117`	`menu->addAction( pagePropertiesAction );`
`118`	`118`	`QAction *removePageAction = new QAction( tr( "Remove Page" ), menu );`
Original file line number	Diff line number	Diff line change
`@@ -1456,7 +1456,7 @@ void QgsLayoutDesignerDialog::undoRedoOccurredForItems( const QSet<QString> item`
`1456`	`1456`	`mBlockItemOptions = false;`
`1457`	`1457`
`1458`	`1458`	`if ( focusItem )`
`1459`		`- showItemOptions( focusItem );`
	`1459`	`+ showItemOptions( focusItem, false );`
`1460`	`1460`	`}`
`1461`	`1461`
`1462`	`1462`	`void QgsLayoutDesignerDialog::saveAsTemplate()`