sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[browser] Fix some items which are marked as "Collapse" capability

Browse Source 
are incorrectly expanded on startup
This commit is contained in:
Nyall Dawson 2018-10-30 11:37:25 +10:00
parent a873289da7
commit 5ebb974569
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/qgsbrowsertreeview.cpp
View File

@ -62,7 +62,7 @@ void QgsBrowserTreeView::saveState()
QgsSettings settings;
QStringList expandedPaths = expandedPathsList( QModelIndex() );
settings.setValue( expandedPathsKey(), expandedPaths );
QgsDebugMsgLevel( "expandedPaths = " + expandedPaths.join( " " ), 4 );
QgsDebugMsgLevel( "expandedPaths = " + expandedPaths.join( ' ' ), 4 );
}
void QgsBrowserTreeView::restoreState()
@ -70,7 +70,7 @@ void QgsBrowserTreeView::restoreState()
QgsSettings settings;
mExpandPaths = settings.value( expandedPathsKey(), QVariant() ).toStringList();
QgsDebugMsgLevel( "mExpandPaths = " + mExpandPaths.join( " " ), 4 );
QgsDebugMsgLevel( "mExpandPaths = " + mExpandPaths.join( ' ' ), 4 );
if ( !mExpandPaths.isEmpty() )
{
QSet<QModelIndex> expandIndexSet;
@ -167,7 +167,7 @@ void QgsBrowserTreeView::rowsInserted( const QModelIndex &parentIndex, int start
if ( mExpandPaths.isEmpty() )
return;
QgsDebugMsgLevel( "mExpandPaths = " + mExpandPaths.join( "," ), 2 );
QgsDebugMsgLevel( "mExpandPaths = " + mExpandPaths.join( ',' ), 2 );
QString parentPath = model()->data( parentIndex, QgsBrowserModel::PathRole ).toString();
QgsDebugMsgLevel( "parentPath = " + parentPath, 2 );
@ -197,7 +197,15 @@ void QgsBrowserTreeView::rowsInserted( const QModelIndex &parentIndex, int start
if ( mExpandPaths.contains( childPath ) || mExpandPaths.indexOf( QRegExp( "^" + escapedChildPath + "/.*" ) ) != -1 )
{
QgsDebugMsgLevel( QStringLiteral( "-> expand" ), 2 );
expand( childIndex );
QModelIndex modelIndex = browserModel()->findPath( childPath, Qt::MatchExactly );
if ( modelIndex.isValid() )
{
QgsDataItem *ptr = browserModel()->dataItem( modelIndex );
if ( !ptr || !( ptr->capabilities2() & QgsDataItem::Capability::Collapse ) )
{
expand( childIndex );
}
}
}
}
}