sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix effect preview picture not set when effect widget is opened in dialog mode

Browse Source 
Also fix a memory leak when opened in dialog mode

Fixes #33600
This commit is contained in:
Nyall Dawson 2020-01-05 15:44:55 +10:00
parent cf6cd48b38
commit 8a9a174c3b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/effects/qgseffectstackpropertieswidget.cpp
View File

@ -470,15 +470,15 @@ void QgsEffectStackCompactWidget::showDialog()
return;
QgsEffectStack *clone = mStack->clone();
QgsEffectStackPropertiesWidget *widget = new QgsEffectStackPropertiesWidget( clone, nullptr );
if ( mPreviewPicture )
{
widget->setPreviewPicture( *mPreviewPicture );
}
QgsPanelWidget *panel = QgsPanelWidget::findParentPanel( qobject_cast< QWidget * >( parent() ) );
if ( panel && panel->dockMode() )
{
QgsEffectStackPropertiesWidget *widget = new QgsEffectStackPropertiesWidget( clone, nullptr );
if ( mPreviewPicture )
{
widget->setPreviewPicture( *mPreviewPicture );
}
connect( widget, &QgsPanelWidget::widgetChanged, this, &QgsEffectStackCompactWidget::updateEffectLive );
connect( widget, &QgsPanelWidget::panelAccepted, this, &QgsEffectStackCompactWidget::updateAcceptWidget );
panel->openPanel( widget );
@ -486,6 +486,11 @@ void QgsEffectStackCompactWidget::showDialog()
else
{
QgsEffectStackPropertiesDialog dlg( clone, this );
if ( mPreviewPicture )
{
dlg.setPreviewPicture( *mPreviewPicture );
}
if ( dlg.exec() == QDialog::Accepted )
{
*mStack = *clone;