Avoid dialog 'flashing' when opening annotation properties

nyalldawson · nyalldawson · commit 89b0a72ccb2c · 2016-07-26T20:38:35.000+10:00
(cherry-picked from a798ba0)
diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp
@@ -26,7 +26,6 @@ QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, Q
 {
   setupUi( this );
   mEmbeddedWidget = new QgsAnnotationWidget( mItem );
-  mEmbeddedWidget->show();
   mStackedWidget->addWidget( mEmbeddedWidget );
   mStackedWidget->setCurrentWidget( mEmbeddedWidget );
 
diff --git a/src/app/qgshtmlannotationdialog.cpp b/src/app/qgshtmlannotationdialog.cpp
@@ -27,7 +27,6 @@ QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, Q
   setupUi( this );
   setWindowTitle( tr( "HTML annotation" ) );
   mEmbeddedWidget = new QgsAnnotationWidget( mItem );
-  mEmbeddedWidget->show();
   mStackedWidget->addWidget( mEmbeddedWidget );
   mStackedWidget->setCurrentWidget( mEmbeddedWidget );
 
diff --git a/src/app/qgssvgannotationdialog.cpp b/src/app/qgssvgannotationdialog.cpp
@@ -28,7 +28,6 @@ QgsSvgAnnotationDialog::QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWid
   setupUi( this );
   setWindowTitle( tr( "SVG annotation" ) );
   mEmbeddedWidget = new QgsAnnotationWidget( mItem );
-  mEmbeddedWidget->show();
   mStackedWidget->addWidget( mEmbeddedWidget );
   mStackedWidget->setCurrentWidget( mEmbeddedWidget );
 
diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp
@@ -25,7 +25,6 @@ QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsTextAnnotationItem* item, Q
 {
   setupUi( this );
   mEmbeddedWidget = new QgsAnnotationWidget( mItem );
-  mEmbeddedWidget->show();
   mStackedWidget->addWidget( mEmbeddedWidget );
   mStackedWidget->setCurrentWidget( mEmbeddedWidget );
   if ( mItem )

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, Q`
`26`	`26`	`{`
`27`	`27`	`setupUi( this );`
`28`	`28`	`mEmbeddedWidget = new QgsAnnotationWidget( mItem );`
`29`		`- mEmbeddedWidget->show();`
`30`	`29`	`mStackedWidget->addWidget( mEmbeddedWidget );`
`31`	`30`	`mStackedWidget->setCurrentWidget( mEmbeddedWidget );`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsTextAnnotationItem* item, Q`
`25`	`25`	`{`
`26`	`26`	`setupUi( this );`
`27`	`27`	`mEmbeddedWidget = new QgsAnnotationWidget( mItem );`
`28`		`- mEmbeddedWidget->show();`
`29`	`28`	`mStackedWidget->addWidget( mEmbeddedWidget );`
`30`	`29`	`mStackedWidget->setCurrentWidget( mEmbeddedWidget );`
`31`	`30`	`if ( mItem )`