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

Make PLEditor greedy selections of rectangles sparse. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6278
This commit is contained in:
Jeff Young 2020-12-02 22:31:01 +00:00
parent 9191b4a41b
commit 599a33a9c6
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/page_layout/ws_draw_item.cpp
View File

@ -352,6 +352,44 @@ bool WS_DRAW_ITEM_RECT::HitTest( const wxPoint& aPosition, int aAccuracy ) const
}
bool WS_DRAW_ITEM_RECT::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const
{
EDA_RECT sel = aRect;
if ( aAccuracy )
sel.Inflate( aAccuracy );
if( aContained )
return sel.Contains( GetBoundingBox() );
// For greedy we need to check each side of the rect as we're pretty much always inside the
// rect which defines the worksheet frame.
EDA_RECT side = GetBoundingBox();
side.SetHeight( 0 );
if( sel.Intersects( side ) )
return true;
side.SetY( GetBoundingBox().GetBottom() );
if( sel.Intersects( side ) )
return true;
side = GetBoundingBox();
side.SetWidth( 0 );
if( sel.Intersects( side ) )
return true;
side.SetX( GetBoundingBox().GetRight() );
if( sel.Intersects( side ) )
return true;
return false;
}
wxString WS_DRAW_ITEM_RECT::GetSelectMenuText( EDA_UNITS aUnits ) const
{
return wxString::Format( _( "Rectangle, width %s height %s" ),

1
include/page_layout/ws_draw_item.h
View File

@ -226,6 +226,7 @@ public:
const EDA_RECT GetBoundingBox() const override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy = 0 ) const override;
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;