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

Fix a mistake in grip margin. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12952
This commit is contained in:
Alex 2022-11-21 00:24:16 +05:00
parent 8498630876
commit 12a55f20d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/tools/ee_selection_tool.cpp
View File

@ -1895,13 +1895,13 @@ void EE_SELECTION_TOOL::unhighlight( EDA_ITEM* aItem, int aMode, SELECTION* aGro
bool EE_SELECTION_TOOL::selectionContains( const VECTOR2I& aPoint ) const
{
const unsigned GRIP_MARGIN = 20;
VECTOR2I margin = getView()->ToWorld( VECTOR2I( GRIP_MARGIN, GRIP_MARGIN ), false );
double margin = getView()->ToWorld( GRIP_MARGIN );
// Check if the point is located within any of the currently selected items bounding boxes
for( EDA_ITEM* item : m_selection )
{
BOX2I itemBox = item->ViewBBox();
itemBox.Inflate( margin.x, margin.y ); // Give some margin for gripping an item
itemBox.Inflate( margin ); // Give some margin for gripping an item
if( itemBox.Contains( aPoint ) )
return true;

8
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -2697,15 +2697,15 @@ void PCB_SELECTION_TOOL::unhighlightInternal( EDA_ITEM* aItem, int aMode, bool a
bool PCB_SELECTION_TOOL::selectionContains( const VECTOR2I& aPoint ) const
{
const unsigned GRIP_MARGIN = 20;
VECTOR2I margin = getView()->ToWorld( VECTOR2I( GRIP_MARGIN, GRIP_MARGIN ), false );
double margin = getView()->ToWorld( GRIP_MARGIN );
// Check if the point is located within any of the currently selected items bounding boxes
// Check if the point is located close to any of the currently selected items
for( EDA_ITEM* item : m_selection )
{
BOX2I itemBox = item->ViewBBox();
itemBox.Inflate( margin.x, margin.y ); // Give some margin for gripping an item
itemBox.Inflate( margin ); // Give some margin for gripping an item
if( itemBox.Contains( aPoint ) && item->HitTest( aPoint, GRIP_MARGIN ) )
if( itemBox.Contains( aPoint ) && item->HitTest( aPoint, margin ) )
return true;
}