Skip to content

Commit 88077e4

Browse files
committed
Fix layout display when canceling export settings dialogs
1 parent 1ccbdb8 commit 88077e4

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/app/layout/qgslayoutdesignerdialog.cpp

+8-9
Original file line numberDiff line numberDiff line change
@@ -2064,13 +2064,13 @@ void QgsLayoutDesignerDialog::exportToPdf()
20642064

20652065
setLastExportPath( outputFileName );
20662066

2067-
mView->setPaintingEnabled( false );
2068-
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
2069-
20702067
QgsLayoutExporter::PdfExportSettings pdfSettings;
20712068
if ( !getPdfExportSettings( pdfSettings ) )
20722069
return;
20732070

2071+
mView->setPaintingEnabled( false );
2072+
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
2073+
20742074
QgsProxyProgressTask *proxyTask = new QgsProxyProgressTask( tr( "Exporting “%1”" ).arg( mMasterLayout->name() ) );
20752075
QgsApplication::taskManager()->addTask( proxyTask );
20762076

@@ -2967,13 +2967,12 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
29672967
outputFileName = QDir( dir ).filePath( QStringLiteral( "atlas" ) ); // filename is overridden by atlas
29682968
}
29692969

2970-
mView->setPaintingEnabled( false );
2971-
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
2972-
29732970
QgsLayoutExporter::PdfExportSettings pdfSettings;
29742971
if ( !getPdfExportSettings( pdfSettings ) )
29752972
return;
29762973

2974+
mView->setPaintingEnabled( false );
2975+
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
29772976
pdfSettings.rasterizeWholeImage = mLayout->customProperty( QStringLiteral( "rasterize" ), false ).toBool();
29782977

29792978
QString error;
@@ -3345,9 +3344,6 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
33453344
}
33463345
setLastExportPath( outputFileName );
33473346

3348-
mView->setPaintingEnabled( false );
3349-
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
3350-
33513347
bool rasterize = false;
33523348
if ( mLayout )
33533349
{
@@ -3357,6 +3353,9 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
33573353
if ( !getPdfExportSettings( pdfSettings ) )
33583354
return;
33593355

3356+
mView->setPaintingEnabled( false );
3357+
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
3358+
33603359
pdfSettings.rasterizeWholeImage = rasterize;
33613360

33623361
QString error;

0 commit comments

Comments
 (0)