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

Sort on first column if none specified. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16054
This commit is contained in:
Jeff Young 2023-11-21 17:08:44 +00:00
parent fa580601f2
commit e4b7170a92
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/widgets/search_handlers.cpp
View File

@ -67,15 +67,18 @@ void SCH_SEARCH_HANDLER::FindAll( const std::function<bool( SCH_ITEM*, SCH_SHEET
void SCH_SEARCH_HANDLER::Sort( int aCol, bool aAscending ) void SCH_SEARCH_HANDLER::Sort( int aCol, bool aAscending )
{ {
int col = std::max( 0, aCol ); // Provide a stable order by sorting on first column if no
// sort column provided.
std::sort( m_hitlist.begin(), m_hitlist.end(), std::sort( m_hitlist.begin(), m_hitlist.end(),
[&]( const SCH_SEARCH_HIT& a, const SCH_SEARCH_HIT& b ) -> bool [&]( const SCH_SEARCH_HIT& a, const SCH_SEARCH_HIT& b ) -> bool
{ {
// N.B. To meet the iterator sort conditions, we cannot simply invert the truth // N.B. To meet the iterator sort conditions, we cannot simply invert the truth
// to get the opposite sort. i.e. ~(a<b) != (a>b) // to get the opposite sort. i.e. ~(a<b) != (a>b)
if( aAscending ) if( aAscending )
return StrNumCmp( getResultCell( a, aCol ), getResultCell( b, aCol ), true ) < 0; return StrNumCmp( getResultCell( a, col ), getResultCell( b, col ), true ) < 0;
else else
return StrNumCmp( getResultCell( b, aCol ), getResultCell( a, aCol ), true ) < 0; return StrNumCmp( getResultCell( b, col ), getResultCell( a, col ), true ) < 0;
} ); } );
} }