sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure report dock is visible when opening a report designer

Browse Source
This commit is contained in:
Nyall Dawson 2018-01-05 12:12:33 +10:00
parent eae4eeb8f5
commit a4f854e2c1
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -675,7 +675,7 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
addDockWidget( Qt::RightDockWidgetArea, mUndoDock );
addDockWidget( Qt::RightDockWidgetArea, mItemsDock );
addDockWidget( Qt::RightDockWidgetArea, mAtlasDock );
addDockWidget( Qt::RightDockWidgetArea, mReportDock );
addDockWidget( Qt::LeftDockWidgetArea, mReportDock );
createLayoutPropertiesWidget();
@ -914,6 +914,13 @@ void QgsLayoutDesignerDialog::open()
{
mView->zoomFull(); // zoomFull() does not work properly until we have called show()
}
if ( mMasterLayout && mMasterLayout->layoutType() == QgsMasterLayoutInterface::Report )
{
mReportDock->show();
mReportDock->raise();
mReportDock->setUserVisible( true );
}
}
void QgsLayoutDesignerDialog::activate()
@ -1990,12 +1997,7 @@ void QgsLayoutDesignerDialog::showAtlasSettings()
if ( !mAtlasDock )
return;
if ( !mAtlasDock->isVisible() )
{
mAtlasDock->show();
}
mAtlasDock->raise();
mAtlasDock->setUserVisible( true );
}
void QgsLayoutDesignerDialog::atlasPreviewTriggered( bool checked )
@ -3277,12 +3279,7 @@ void QgsLayoutDesignerDialog::showReportSettings()
if ( !mReportDock )
return;
if ( !mReportDock->isVisible() )
{
mReportDock->show();
}
mReportDock->raise();
mReportDock->setUserVisible( true );
}
void QgsLayoutDesignerDialog::pageSetup()
@ -3435,11 +3432,7 @@ void QgsLayoutDesignerDialog::createReportWidget()
QgsReportOrganizerWidget *reportWidget = new QgsReportOrganizerWidget( mReportDock, this, report );
reportWidget->setMessageBar( mMessageBar );
mReportDock->setWidget( reportWidget );
mReportDock->show();
mReportDock->raise();
mReportToolbar->show();
mPanelsMenu->addAction( mReportDock->toggleViewAction() );
}

3
src/gui/qgsdockwidget.cpp
View File

@ -35,9 +35,6 @@ void QgsDockWidget::setUserVisible( bool visible )
{
if ( visible )
{
if ( mVisibleAndActive )
return;
show();
raise();
}