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

When deselecting items, pick only selected ones. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10292
This commit is contained in:
Alex 2022-09-06 18:11:56 +03:00 committed by Seth Hillbrand
parent fa3e9efdce
commit d67c81a657
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/tools/ee_selection_tool.cpp
View File

@ -818,7 +818,7 @@ bool EE_SELECTION_TOOL::CollectHits( EE_COLLECTOR& aCollector, const VECTOR2I& a
void EE_SELECTION_TOOL::narrowSelection( EE_COLLECTOR& collector, const VECTOR2I& aWhere, void EE_SELECTION_TOOL::narrowSelection( EE_COLLECTOR& collector, const VECTOR2I& aWhere,
bool aCheckLocked ) bool aCheckLocked, bool aSelectedOnly )
{ {
for( int i = collector.GetCount() - 1; i >= 0; --i ) for( int i = collector.GetCount() - 1; i >= 0; --i )
{ {
@ -833,6 +833,12 @@ void EE_SELECTION_TOOL::narrowSelection( EE_COLLECTOR& collector, const VECTOR2I
collector.Remove( i ); collector.Remove( i );
continue; continue;
} }
if( aSelectedOnly && !collector[i]->IsSelected() )
{
collector.Remove( i );
continue;
}
} }
// Apply some ugly heuristics to avoid disambiguation menus whenever possible // Apply some ugly heuristics to avoid disambiguation menus whenever possible
@ -947,7 +953,7 @@ bool EE_SELECTION_TOOL::SelectPoint( const VECTOR2I& aWhere,
if( !CollectHits( collector, aWhere, aScanTypes ) ) if( !CollectHits( collector, aWhere, aScanTypes ) )
return false; return false;
narrowSelection( collector, aWhere, aCheckLocked ); narrowSelection( collector, aWhere, aCheckLocked, aSubtract );
return selectPoint( collector, aWhere, aItem, aSelectionCancelledFlag, aAdd, aSubtract, return selectPoint( collector, aWhere, aItem, aSelectionCancelledFlag, aAdd, aSubtract,
aExclusiveOr ); aExclusiveOr );

4
eeschema/tools/ee_selection_tool.h
View File

@ -191,8 +191,10 @@ private:
* @param aCollector [in, out] Provides collection conditions and stores collected items. * @param aCollector [in, out] Provides collection conditions and stores collected items.
* @param aWhere point where we should narrow (if relevant) * @param aWhere point where we should narrow (if relevant)
* @param aCheckLocked If false, remove locked elements from #collector * @param aCheckLocked If false, remove locked elements from #collector
* @param aSelectedOnly If true, remove non-selected items from #collector
*/ */
void narrowSelection( EE_COLLECTOR& collector, const VECTOR2I& aWhere, bool aCheckLocked ); void narrowSelection( EE_COLLECTOR& collector, const VECTOR2I& aWhere, bool aCheckLocked,
bool aSelectedOnly = false );
/** /**
* Perform a click-type selection at a point (usually the cursor position). * Perform a click-type selection at a point (usually the cursor position).

10
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -722,6 +722,16 @@ bool PCB_SELECTION_TOOL::selectPoint( const VECTOR2I& aWhere, bool aOnDrag,
// Apply the stateful filter // Apply the stateful filter
FilterCollectedItems( collector, false ); FilterCollectedItems( collector, false );
// For subtracting, we only want items that are selected
if( m_subtractive )
{
for( int i = collector.GetCount() - 1; i >= 0; --i )
{
if( !collector[i]->IsSelected() )
collector.Remove( i );
}
}
// Apply some ugly heuristics to avoid disambiguation menus whenever possible // Apply some ugly heuristics to avoid disambiguation menus whenever possible
if( collector.GetCount() > 1 && !m_skip_heuristics ) if( collector.GetCount() > 1 && !m_skip_heuristics )
GuessSelectionCandidates( collector, aWhere ); GuessSelectionCandidates( collector, aWhere );