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

Use the event position always instead of the view cursor position 

Fix #5850
This commit is contained in:
Marek Roszko 2020-10-03 15:05:28 -04:00
parent b69d396afc
commit 0b2b8b150d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/tools/ee_selection_tool.cpp
View File

@ -321,9 +321,6 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
EE_GRID_HELPER grid( m_toolMgr ); EE_GRID_HELPER grid( m_toolMgr );
VECTOR2I rawPos = evt->IsPrime() ? evt->Position() : getViewControls()->GetMousePosition();
VECTOR2I cursorPos = grid.BestSnapAnchor( rawPos, nullptr );
// Single click? Select single object // Single click? Select single object
if( evt->IsClick( BUT_LEFT ) ) if( evt->IsClick( BUT_LEFT ) )
{ {
@ -341,8 +338,10 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
if( collector.GetCount() == 1 ) if( collector.GetCount() == 1 )
{ {
// Check if we want to auto start wires // Check if we want to auto start wires
VECTOR2I snappedCursorPos = grid.BestSnapAnchor( evt->Position(), nullptr );
if( m_frame->eeconfig()->m_Drawing.auto_start_wires if( m_frame->eeconfig()->m_Drawing.auto_start_wires
&& collector[0]->IsPointClickableAnchor( (wxPoint) cursorPos ) ) && collector[0]->IsPointClickableAnchor( (wxPoint) snappedCursorPos ) )
{ {
OPT_TOOL_EVENT newEvt = EE_ACTIONS::drawWire.MakeEvent(); OPT_TOOL_EVENT newEvt = EE_ACTIONS::drawWire.MakeEvent();
auto* params = newEvt->Parameter<DRAW_SEGMENT_EVENT_PARAMS*>(); auto* params = newEvt->Parameter<DRAW_SEGMENT_EVENT_PARAMS*>();
@ -507,8 +506,10 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
if( collector.GetCount() == 1 ) if( collector.GetCount() == 1 )
{ {
VECTOR2I snappedCursorPos = grid.BestSnapAnchor( evt->Position(), nullptr );
if( m_frame->eeconfig()->m_Drawing.auto_start_wires if( m_frame->eeconfig()->m_Drawing.auto_start_wires
&& collector[0]->IsPointClickableAnchor( (wxPoint) cursorPos ) ) && collector[0]->IsPointClickableAnchor( (wxPoint) snappedCursorPos ) )
{ {
displayPencil = true; displayPencil = true;
} }