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

LIB_TREE: fix an issue when using the popup menu: 

- At least on wxWidgets 3.2 GetPopupMenuSelectionFromUser() returns the submenu
id, not the submenu idx from 0
- wxID_NONE can be returned when clicking outside the popup menu, or cancel.
This commit is contained in:
jean-pierre charras 2023-05-02 12:40:20 +02:00
parent cb85412b85
commit 7691cd9509
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/widgets/lib_tree.cpp
View File

@ -83,6 +83,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
m_sort_ctrl->Bind( wxEVT_LEFT_DOWN,
[&]( wxMouseEvent& aEvent )
{
// Build a pop menu:
wxMenu menu;
menu.Append( 4201, _( "Sort by Best Match" ), wxEmptyString, wxITEM_CHECK );
@ -93,12 +94,15 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
else
menu.Check( 4202, true );
if( m_sort_ctrl->GetPopupMenuSelectionFromUser( menu ) == 0 )
// menu_id is the selected submenu id from the popup menu or wxID_NONE
int menu_id = m_sort_ctrl->GetPopupMenuSelectionFromUser( menu );
if( menu_id == 0 || menu_id == 4201 )
{
m_adapter->SetSortMode( LIB_TREE_MODEL_ADAPTER::BEST_MATCH );
Regenerate( true );
}
else
else if( menu_id == 1 || menu_id == 4202 )
{
m_adapter->SetSortMode( LIB_TREE_MODEL_ADAPTER::ALPHABETIC );
Regenerate( true );