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

Treat canvas item as current when tree view contains no selection. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/12702
This commit is contained in:
Jeff Young 2023-06-04 20:51:28 +01:00
parent 039f23eba8
commit 1528f4700c
8 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib_tree_model_adapter.cpp
View File

@ -417,6 +417,12 @@ wxDataViewItem LIB_TREE_MODEL_ADAPTER::FindItem( const LIB_ID& aLibId )
}
wxDataViewItem LIB_TREE_MODEL_ADAPTER::GetCurrentDataViewItem()
{
return FindItem( m_preselect_lib_id );
}
unsigned int LIB_TREE_MODEL_ADAPTER::GetChildren( const wxDataViewItem& aItem,
wxDataViewItemArray& aChildren ) const
{

6
common/widgets/lib_tree.cpp
View File

@ -529,7 +529,11 @@ void LIB_TREE::onDebounceTimer( wxTimerEvent& aEvent )
void LIB_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
{
const wxDataViewItem sel = m_tree_ctrl->GetSelection();
wxDataViewItem sel = m_tree_ctrl->GetSelection();
if( !sel.IsOk() )
sel = m_adapter->GetCurrentDataViewItem();
LIB_TREE_NODE::TYPE type = sel.IsOk() ? m_adapter->GetTypeFor( sel ) : LIB_TREE_NODE::INVALID;
switch( aKeyStroke.GetKeyCode() )

9
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -208,6 +208,15 @@ SYMBOL_TREE_SYNCHRONIZING_ADAPTER::deleteLibrary( LIB_TREE_NODE::PTR_VECTOR::ite
}
wxDataViewItem SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetCurrentDataViewItem()
{
if( m_frame->GetCurSymbol() )
return FindItem( m_frame->GetCurSymbol()->GetLibId() );
return wxDataViewItem();
}
void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataViewItem const& aItem,
unsigned int aCol ) const
{

2
eeschema/symbol_tree_synchronizing_adapter.h
View File

@ -48,6 +48,8 @@ public:
TOOL_INTERACTIVE* GetContextMenuTool() override;
wxDataViewItem GetCurrentDataViewItem() override;
protected:
void updateLibrary( LIB_TREE_NODE_LIB& aLibNode );

2
include/lib_tree_model_adapter.h
View File

@ -283,6 +283,8 @@ public:
*/
wxDataViewItem FindItem( const LIB_ID& aLibId );
virtual wxDataViewItem GetCurrentDataViewItem();
/**
* Populate a list of all the children of an item
*

1
include/widgets/lib_tree.h
View File

@ -230,7 +230,6 @@ protected:
wxTimer* m_debounceTimer;
bool m_inTimerEvent;
LIB_ID m_last_libid;
wxString m_recentSearchesKey;
bool m_skipNextRightClick;

6
pcbnew/fp_tree_synchronizing_adapter.cpp
View File

@ -169,6 +169,12 @@ FP_TREE_SYNCHRONIZING_ADAPTER::deleteLibrary( LIB_TREE_NODE::PTR_VECTOR::iterato
}
wxDataViewItem FP_TREE_SYNCHRONIZING_ADAPTER::GetCurrentDataViewItem()
{
return FindItem( m_frame->GetLoadedFPID() );
}
void FP_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataViewItem const& aItem,
unsigned int aCol ) const
{

2
pcbnew/fp_tree_synchronizing_adapter.h
View File

@ -44,6 +44,8 @@ public:
TOOL_INTERACTIVE* GetContextMenuTool() override;
wxDataViewItem GetCurrentDataViewItem() override;
protected:
FP_TREE_SYNCHRONIZING_ADAPTER( FOOTPRINT_EDIT_FRAME* aFrame, FP_LIB_TABLE* aLibs );