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

Minor SELECTION_TOOL fixes.

This commit is contained in:
Maciej Suminski 2015-06-16 14:51:39 +02:00
parent c007e308f8
commit dd5275f6c6
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/tool/action_manager.cpp
View File

@ -120,7 +120,7 @@ bool ACTION_MANAGER::RunHotKey( int aHotKey ) const
// different combination // different combination
if( it == m_actionHotKeys.end() ) if( it == m_actionHotKeys.end() )
{ {
it = m_actionHotKeys.find( key | (mod & ~MD_SHIFT) ); it = m_actionHotKeys.find( key | ( mod & ~MD_SHIFT ) );
if( it == m_actionHotKeys.end() ) if( it == m_actionHotKeys.end() )
return false; // no appropriate action found for the hotkey return false; // no appropriate action found for the hotkey

2
pcbnew/tools/edit_tool.h
View File

@ -220,7 +220,7 @@ private:
{ {
const SELECTION& selection = m_selectionTool->GetSelection(); const SELECTION& selection = m_selectionTool->GetSelection();
if( selection.items.GetCount() > 1 ) if( selection.items.GetCount() != 1 )
return NULL; return NULL;
BOARD_ITEM* item = selection.Item<BOARD_ITEM>( 0 ); BOARD_ITEM* item = selection.Item<BOARD_ITEM>( 0 );

12
pcbnew/tools/selection_tool.cpp
View File

@ -1325,16 +1325,8 @@ bool SELECTION_TOOL::SanitizeSelection()
} }
} }
while( !rejected.empty () ) BOOST_FOREACH( BOARD_ITEM* item, rejected )
{ unselect( item );
BOARD_ITEM* item = *rejected.begin();
int itemIdx = m_selection.items.FindItem( item );
if( itemIdx >= 0 )
m_selection.items.RemovePicker( itemIdx );
rejected.erase( item );
}
return true; return true;
} }