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

Not everything in a VIEW_GROUP is an EDA_ITEM. 

Fixes: lp:1842394
* https://bugs.launchpad.net/kicad/+bug/1842394
This commit is contained in:
Jeff Young 2019-09-03 17:24:24 +01:00
parent 720de6bae1
commit 54a85cfaa2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/tools/ee_selection_tool.cpp
View File

@ -696,11 +696,11 @@ bool EE_SELECTION_TOOL::selectMultiple()
view->Query( selectionBox, selectedItems ); // Get the list of selected items view->Query( selectionBox, selectedItems ); // Get the list of selected items
// Sheet pins aren't in the view; add them by hand // Sheet pins aren't in the view; add them by hand
for( auto& pair : selectedItems ) for( KIGFX::VIEW::LAYER_ITEM_PAIR& pair : selectedItems )
{ {
auto item = dynamic_cast<EDA_ITEM*>( pair.first ); SCH_SHEET* sheet = dynamic_cast<SCH_SHEET*>( pair.first );
if( auto sheet = dyn_cast<SCH_SHEET*>( item ) ) if( sheet )
{ {
int layer = pair.second; int layer = pair.second;
@ -709,8 +709,6 @@ bool EE_SELECTION_TOOL::selectMultiple()
} }
} }
std::vector<KIGFX::VIEW::LAYER_ITEM_PAIR>::iterator it, it_end;
int width = area.GetEnd().x - area.GetOrigin().x; int width = area.GetEnd().x - area.GetOrigin().x;
int height = area.GetEnd().y - area.GetOrigin().y; int height = area.GetEnd().y - area.GetOrigin().y;
@ -730,14 +728,11 @@ bool EE_SELECTION_TOOL::selectMultiple()
selectionRect.Normalize(); selectionRect.Normalize();
for( it = selectedItems.begin(), it_end = selectedItems.end(); it != it_end; ++it ) for( KIGFX::VIEW::LAYER_ITEM_PAIR& pair : selectedItems )
{ {
EDA_ITEM* item = static_cast<EDA_ITEM*>( it->first ); EDA_ITEM* item = dynamic_cast<EDA_ITEM*>( pair.first );
if( !item || !Selectable( item ) ) if( item && Selectable( item ) && item->HitTest( selectionRect, windowSelection ) )
continue;
if( item->HitTest( selectionRect, windowSelection ) )
{ {
if( m_subtractive || ( m_exclusive_or && item->IsSelected() ) ) if( m_subtractive || ( m_exclusive_or && item->IsSelected() ) )
{ {