haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore selection after rebuilding DRC/ERC tree. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5042
This commit is contained in:
Jeff Young 2020-08-01 18:19:31 +01:00
parent 689910ab0a
commit c8170d9430
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/rc_item.cpp
View File

@ -142,11 +142,17 @@ void RC_TREE_MODEL::rebuildModel( RC_ITEMS_PROVIDER* aProvider, int aSeverities
{ {
wxWindowUpdateLocker updateLock( m_view ); wxWindowUpdateLocker updateLock( m_view );
// Even with the updateLock, wxWidgets sometimes ties its knickers in RC_ITEM* selectedRcItem = nullptr;
// a knot when trying to run a wxdataview_selection_changed_callback()
// on a row that has been deleted.
if( m_view ) if( m_view )
{
RC_TREE_NODE* selectedNode = ToNode( m_view->GetSelection() );
selectedRcItem = selectedNode ? selectedNode->m_RcItem : nullptr;
// Even with the updateLock, wxWidgets sometimes ties its knickers in a knot trying
// to run a wxdataview_selection_changed_callback() on a row that has been deleted.
m_view->UnselectAll(); m_view->UnselectAll();
}
if( aProvider != m_rcItemsProvider ) if( aProvider != m_rcItemsProvider )
{ {
@ -200,6 +206,21 @@ void RC_TREE_MODEL::rebuildModel( RC_ITEMS_PROVIDER* aProvider, int aSeverities
m_view->AppendTextColumn( wxEmptyString, 0, wxDATAVIEW_CELL_INERT, width ); m_view->AppendTextColumn( wxEmptyString, 0, wxDATAVIEW_CELL_INERT, width );
ExpandAll(); ExpandAll();
// Most annoyingly wxWidgets won't tell us the scroll position (and no, all the usual
// routines don't work), so we can only restore the scroll position based on a selection.
if( selectedRcItem )
{
for( RC_TREE_NODE* candidate : m_tree )
{
if( candidate->m_RcItem == selectedRcItem )
{
m_view->Select( ToItem( candidate ) );
m_view->EnsureVisible( ToItem( candidate ) );
break;
}
}
}
} }

2
common/rc_item.h
View File

@ -291,6 +291,8 @@ private:
RC_ITEMS_PROVIDER* m_rcItemsProvider; // I own this, but not its contents RC_ITEMS_PROVIDER* m_rcItemsProvider; // I own this, but not its contents
std::vector<RC_TREE_NODE*> m_tree; // I own this std::vector<RC_TREE_NODE*> m_tree; // I own this
mutable const RC_ITEM* m_lastQueried; // Used as a massive hack to restore the
// widget's scroll position.
}; };